ARM: Merge for-2635-4/s5p-devs

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

Conflicts:
	arch/arm/mach-s5pc100/include/mach/map.h
This commit is contained in:
Ben Dooks 2010-05-20 19:38:30 +09:00
commit 84eb9ecce2
5 changed files with 309 additions and 0 deletions