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
This commit is contained in:
Ben Dooks 2010-05-20 20:25:59 +09:00
commit 206a1a825d
19 changed files with 368 additions and 12 deletions