From: Kukjin Kim <kgene.kim@samsung.com>
Date: Sat, 22 Sep 2012 03:11:21 +0000 (+0900)
Subject: Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~56^2^2^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56952baa9b6f6bc06437abd51baefc4f7c8dee3b;p=pandora-kernel.git

Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new

Conflicts:
	arch/arm/mach-exynos/mach-smdkv310.c
---

56952baa9b6f6bc06437abd51baefc4f7c8dee3b
Reading git-diff-tree failed