Merge remote-tracking branch 'powerpc/next'

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

Fri, 14 Oct 2011 01:16:52 +0000 (12:16 +1100)

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

Fri, 14 Oct 2011 01:16:52 +0000 (12:16 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 01:16:52 +0000 (12:16 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 01:16:52 +0000 (12:16 +1100)
diff --cc drivers/gpio/Kconfig
Simple merge
diff --cc drivers/gpio/Makefile
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Oct 2011 01:16:52 +0000 (12:16 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 14 Oct 2011 01:16:52 +0000 (12:16 +1100)
		1	2
drivers/gpio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history