Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
authorPaul Mackerras <paulus@samba.org>
Wed, 22 Apr 2009 03:02:09 +0000 (13:02 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 22 Apr 2009 03:02:09 +0000 (13:02 +1000)
commit5bd3ef84d73c2ea7b4babbad060909753c4828d4
treefdf2bafb48ae1ed03175f6c77a7548a181e69ee9
parent0658c16056660886ea2f35c4f038be70a94b1532
parent6d25b688ecc488753af3c9e6f6a9a575b863cf37
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
arch/powerpc/boot/dts/tqm8548-bigflash.dts
arch/powerpc/boot/dts/tqm8548.dts
include/linux/fsl_devices.h