ARM: Merge next-s3c64xx

Merge branch 'next-s3c64xx' into next-samsung

Conflicts:
	arch/arm/mach-s3c6400/include/mach/map.h
	( ADC and RTC PA merge fixed)
This commit is contained in:
Ben Dooks 2010-01-18 09:35:29 +09:00
commit 0084f27a21
4 changed files with 135 additions and 1 deletions