Merge remote-tracking branch 'hsi/for-next'

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

Wed, 21 Dec 2011 04:46:55 +0000 (15:46 +1100)

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

Wed, 21 Dec 2011 04:46:55 +0000 (15:46 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:46:55 +0000 (15:46 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 04:46:55 +0000 (15:46 +1100)
diff --cc drivers/Kconfig
Simple merge
diff --cc drivers/Makefile
Simple merge
diff --cc include/linux/Kbuild
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 04:46:55 +0000 (15:46 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 04:46:55 +0000 (15:46 +1100)
		1	2
drivers/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/Kbuild	patch \|	diff1 \|	diff2 \|	blob \| history