tree b151540007af3aa260418c1519a5c69b56450025
parent 71269364a8d5ea42ecc6cbc7b687e5d45cbabe0e
parent bcedfa98d97e02e95bb023ab93675dbe63c508ef
author Ben Dooks <ben-linux@fluff.org> 1263890522 +0900
committer Ben Dooks <ben-linux@fluff.org> 1263890522 +0900

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)