Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...

author Paul Mackerras <[email protected]>

Tue, 7 Apr 2009 02:54:08 +0000 (12:54 +1000)

committer Paul Mackerras <[email protected]>

Tue, 7 Apr 2009 02:54:08 +0000 (12:54 +1000)
author Paul Mackerras <[email protected]>
Tue, 7 Apr 2009 02:54:08 +0000 (12:54 +1000)
committer Paul Mackerras <[email protected]>
Tue, 7 Apr 2009 02:54:08 +0000 (12:54 +1000)
diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc include/linux/fsl_devices.h
Simple merge
author	Paul Mackerras <[email protected]>
	Tue, 7 Apr 2009 02:54:08 +0000 (12:54 +1000)
committer	Paul Mackerras <[email protected]>
	Tue, 7 Apr 2009 02:54:08 +0000 (12:54 +1000)
		1	2
arch/powerpc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fsl_devices.h	patch \|	diff1 \|	diff2 \|	blob \| history