Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 28 Jan 2010 21:38:25 +0000 (14:38 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 28 Jan 2010 21:38:25 +0000 (14:38 -0700)
commit0ada0a73120c28cc432bcdbac061781465c2f48f
treed17cadd4ea47e25d9e48e7d409a39c84268fbd27
parent6016a363f6b56b46b24655bcfc0499b715851cf3
parent92dcffb916d309aa01778bf8963a6932e4014d07
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
arch/microblaze/Kconfig
arch/powerpc/Kconfig
arch/sparc/kernel/of_device_64.c
drivers/video/aty/atyfb_base.c