From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 19 May 2010 09:07:25 +0000 (+0900)
Subject: ARM: Merge for-2635/samsung-rtc
X-Git-Tag: v2.6.35-rc1~500^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14b8a0f92b309ff452a8c339abd9a096d00b210f;p=pandora-kernel.git

ARM: Merge for-2635/samsung-rtc

Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2

Conflicts:
	arch/arm/mach-s3c64xx/include/mach/map.h
	arch/arm/plat-samsung/Kconfig
	arch/arm/plat-samsung/Makefile
---

14b8a0f92b309ff452a8c339abd9a096d00b210f
Reading git-diff-tree failed