Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree

author Grant Likely <[email protected]>

Thu, 28 Jan 2010 21:38:25 +0000 (14:38 -0700)

committer Grant Likely <[email protected]>

Thu, 28 Jan 2010 21:38:25 +0000 (14:38 -0700)
author Grant Likely <[email protected]>
Thu, 28 Jan 2010 21:38:25 +0000 (14:38 -0700)
committer Grant Likely <[email protected]>
Thu, 28 Jan 2010 21:38:25 +0000 (14:38 -0700)
diff --cc arch/microblaze/Kconfig
Simple merge
diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc arch/sparc/kernel/of_device_64.c
Simple merge
diff --cc drivers/video/aty/atyfb_base.c
Simple merge
author	Grant Likely <[email protected]>
	Thu, 28 Jan 2010 21:38:25 +0000 (14:38 -0700)
committer	Grant Likely <[email protected]>
	Thu, 28 Jan 2010 21:38:25 +0000 (14:38 -0700)
		1	2
arch/microblaze/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/of_device_64.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/aty/atyfb_base.c	patch \|	diff1 \|	diff2 \|	blob \| history