]> git.baikalelectronics.ru Git - kernel.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)
commitc07dcfe0603b21db14706ea5255c56678084c74e
treeb057f2d095797399ce6ef01312359712e4b67b15
parent7d72c4390eb68c129bd0991a0e6de0ff478ac207
parentd2a6167671718ad5b9997950274860a4c4ff9187
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