ARM: Merge next-s3c64xx
authorBen Dooks <ben-linux@fluff.org>
Mon, 18 Jan 2010 00:35:29 +0000 (09:35 +0900)
committerBen Dooks <ben-linux@fluff.org>
Mon, 18 Jan 2010 00:35:29 +0000 (09:35 +0900)
commit0084f27a21d36ac846cd4366289c229a7cce511b
treeb151540007af3aa260418c1519a5c69b56450025
parentbcedfa98d97e02e95bb023ab93675dbe63c508ef
parent71269364a8d5ea42ecc6cbc7b687e5d45cbabe0e
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)
arch/arm/mach-s3c6400/include/mach/map.h
arch/arm/plat-s3c64xx/Makefile