]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6d4bbf9910214b12e6bcf4245dfd1f961d4a177c
treea7c66c65dbc38774dcbba0d2965b1f851fcc1578
parent0a6ce026668c442863f13192be9de2efd1928289
parentf683a2484231621c0ac9de02bf1073063972cfa0
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