From: Ben Dooks <ben-linux@fluff.org>
Date: Tue, 19 Jan 2010 08:42:02 +0000 (+0900)
Subject: ARM: Merge next-samsung-mc-adc
X-Git-Tag: v2.6.34-rc2~66^2~54^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e2376ab1086b2bff18fdb887f5bc13740ae6e24;p=pandora-kernel.git

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)
---

8e2376ab1086b2bff18fdb887f5bc13740ae6e24
Reading git-diff-tree failed