]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commitad28536a898fbdc8c57d64348e310e1bda776963
treeb057f2d095797399ce6ef01312359712e4b67b15
parent18c411b7974f47f84c29507bdf3e0573890c0f0e
parent2a96536e77b43cf1e70ab3ad8b46b98ab52b56c1
Merge branch 'next/devel-samsung-iommu' into next/devel-samsung

Conflicts:
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock-exynos5.c
arch/arm/mach-exynos/include/mach/irqs.h
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/include/mach/regs-clock.h
arch/arm/plat-samsung/include/plat/devs.h