Merge branch 'next/devel-samsung-iommu' into next/devel-samsung
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 12 May 2012 06:31:37 +0000 (15:31 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 12 May 2012 06:31:37 +0000 (15:31 +0900)
Conflicts:
arch/arm/mach-exynos/Makefile


Trivial merge