From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 18 Jan 2010 00:35:29 +0000 (+0900)
Subject: ARM: Merge next-s3c64xx
X-Git-Tag: v2.6.34-rc2~66^2~54^2~25^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0084f27a21d36ac846cd4366289c229a7cce511b;p=pandora-kernel.git

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

0084f27a21d36ac846cd4366289c229a7cce511b
Reading git-diff-tree failed