fix conflict for commit spi & touch screen driver
authorcmc-ubuntu <cmc@ubuntu.(none)>
Thu, 11 Nov 2010 14:09:34 +0000 (22:09 +0800)
committercmc-ubuntu <cmc@ubuntu.(none)>
Thu, 11 Nov 2010 14:09:34 +0000 (22:09 +0800)
commit4a6b5340a6406a25872531ab28ce75cdaddcfa8b
tree0e77549fad301f6f6526e4cb8bfd06459c6181fa
parentcba07fe4a281eb98eae40e300512d44776156820
parent9d8af509346f956a5f2e4991f2fbe48a4657989d
fix conflict for commit spi & touch screen driver
arch/arm/mach-rk29/board-rk29sdk.c
arch/arm/mach-rk29/devices.c
arch/arm/mach-rk29/devices.h
arch/arm/mach-rk29/include/mach/board.h