ARM: Merge for-2635-4/spi-devs
authorBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 10:40:24 +0000 (19:40 +0900)
committerBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 10:40:24 +0000 (19:40 +0900)
commit45c8fa878475b16467109cf6534af03b27e28d10
treea7c66c65dbc38774dcbba0d2965b1f851fcc1578
parent84eb9ecce20acfd287ba0d623fe5e99bfab08686
parentef2f07d31c6b890e0cc3966d4a27fa1d49b740f5
ARM: Merge for-2635-4/spi-devs

Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2

Conflicts:
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
arch/arm/mach-s5p6440/include/mach/map.h
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
arch/arm/mach-s5pv210/include/mach/map.h
arch/arm/plat-samsung/include/plat/devs.h