Merge branch 'for-2635-4/s5p-devs' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s5pc100/include/mach/map.h