]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: Merge for-2635-4/onenand
authorBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 11:25:59 +0000 (20:25 +0900)
committerBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 11:25:59 +0000 (20:25 +0900)
commit34511437a1b6c8dd4ee5187f202c6a62dab78d8e
treee4cdbd7b8b745e0ad4adfd59fa57c3bcabe3daf4
parent43c2a9e7912b3a254cab3d76656574b9f6bba875
parent6fd051c84d641ce1d806091ededfff5e3d99f495
ARM: Merge for-2635-4/onenand

Merge branch 'for-2635-4/onenand' into for-2635-4/partial2

Conflicts:
arch/arm/mach-s5pc100/cpu.c
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s3c64xx/include/mach/map.h
arch/arm/mach-s5pc100/cpu.c
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/Makefile
arch/arm/mach-s5pv210/include/mach/map.h
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/include/plat/devs.h