• Ben Dooks's avatar
    ARM: Merge for-2635-4/onenand · 206a1a82
    Ben Dooks authored
    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
    206a1a82
map.h 2.76 KB