Merge remote-tracking branch 'ia64/test'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 26 Jul 2011 01:30:35 +0000 (11:30 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 26 Jul 2011 01:30:35 +0000 (11:30 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 01:30:35 +0000 (11:30 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 01:30:35 +0000 (11:30 +1000)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/ia64/Kconfig
Simple merge
diff --cc include/linux/efi.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 01:30:35 +0000 (11:30 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 01:30:35 +0000 (11:30 +1000)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/efi.h	patch \|	diff1 \|	diff2 \|	blob \| history