From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 16 Sep 2011 08:13:09 +0000 (+0900)
Subject: Merge branch 'next-samsung-board-v3.1' into next-samsung-board
X-Git-Tag: v3.2-rc1~40^2~14^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2520123382e97271e932377c83bca010c265be55;p=pandora-kernel.git

Merge branch 'next-samsung-board-v3.1' into next-samsung-board

Conflicts:
	arch/arm/mach-exynos4/Kconfig
---

2520123382e97271e932377c83bca010c265be55
Reading git-diff-tree failed