From: Kukjin Kim <kgene.kim@samsung.com>
Date: Mon, 19 Nov 2012 04:18:47 +0000 (+0900)
Subject: Merge branch 'next/dt-exynos4x12' into next/dt-samsung
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~44^2~5^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=326f3abf19360014dfae968aa3ab891d25599618;p=pandora-kernel.git

Merge branch 'next/dt-exynos4x12' into next/dt-samsung

Conflicts:
	arch/arm/boot/dts/exynos4210.dtsi
---

326f3abf19360014dfae968aa3ab891d25599618
Reading git-diff-tree failed