From: Kukjin Kim <kgene.kim@samsung.com>
Date: Sat, 12 May 2012 06:31:37 +0000 (+0900)
Subject: Merge branch 'next/devel-samsung-iommu' into next/devel-samsung
X-Git-Tag: v3.5-rc1~68^2~3^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad28536a898fbdc8c57d64348e310e1bda776963;p=pandora-kernel.git

Merge branch 'next/devel-samsung-iommu' into next/devel-samsung

Conflicts:
	arch/arm/mach-exynos/Makefile
---

ad28536a898fbdc8c57d64348e310e1bda776963
Reading git-diff-tree failed