Merge branch 'v3.11-next/exynos-dt-2' into for-next

author Kukjin Kim <kgene.kim@samsung.com>

Tue, 18 Jun 2013 19:14:20 +0000 (04:14 +0900)

committer Kukjin Kim <kgene.kim@samsung.com>

Tue, 18 Jun 2013 19:14:20 +0000 (04:14 +0900)
author Kukjin Kim <kgene.kim@samsung.com>
Tue, 18 Jun 2013 19:14:20 +0000 (04:14 +0900)
committer Kukjin Kim <kgene.kim@samsung.com>
Tue, 18 Jun 2013 19:14:20 +0000 (04:14 +0900)
diff --cc Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt
Simple merge
author	Kukjin Kim <kgene.kim@samsung.com>
	Tue, 18 Jun 2013 19:14:20 +0000 (04:14 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Tue, 18 Jun 2013 19:14:20 +0000 (04:14 +0900)