Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
Paul Mackerras [Wed, 22 Apr 2009 03:02:09 +0000 (13:02 +1000)]
1  2 
arch/powerpc/boot/dts/tqm8548-bigflash.dts
arch/powerpc/boot/dts/tqm8548.dts
include/linux/fsl_devices.h

Simple merge
Simple merge