ARM: Merge next-samsung-mc-adc
authorBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 08:42:02 +0000 (17:42 +0900)
committerBen Dooks <ben-linux@fluff.org>
Tue, 19 Jan 2010 08:42:02 +0000 (17:42 +0900)
commit8e2376ab1086b2bff18fdb887f5bc13740ae6e24
treeb151540007af3aa260418c1519a5c69b56450025
parent71269364a8d5ea42ecc6cbc7b687e5d45cbabe0e
parentbcedfa98d97e02e95bb023ab93675dbe63c508ef
ARM: Merge next-samsung-mc-adc

Merge branch 'next-samsung-mc-adc' into next-samsung-try5

Conflicts:
arch/arm/mach-s3c6400/include/mach/map.h
(fix ADC and RTC merge)
arch/arm/mach-s3c6400/include/mach/map.h
arch/arm/plat-s3c64xx/Makefile