Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Grant Likely [Thu, 28 Jan 2010 21:38:25 +0000 (14:38 -0700)]
1  2 
arch/microblaze/Kconfig
arch/powerpc/Kconfig
arch/sparc/kernel/of_device_64.c
drivers/video/aty/atyfb_base.c

Simple merge
Simple merge
Simple merge
Simple merge