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)
commit206a1a825dc67060ee319c99569755ba11250907
treee4cdbd7b8b745e0ad4adfd59fa57c3bcabe3daf4
parent6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c
parent999304be1177d42d16bc59c546228c6ac5a3e76a
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