]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next-samsung-devel' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 26 Sep 2011 23:23:02 +0000 (08:23 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 26 Sep 2011 23:23:02 +0000 (08:23 +0900)
commitde88fdead6e3f76f2e5288bddc26a1d75a37ef04
treeb87c800d68910d0c209e112bf681ca1ec11a69ea
parent3270eae3ad9e4079629d18b55aa2792c31aafb21
parent5324a628d86904066eb298b4e739674c4a0c73a4
Merge branch 'next-samsung-devel' into for-next

Conflicts:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/Makefile
arch/arm/mach-exynos4/clock.c
arch/arm/mach-exynos4/mach-origen.c
arch/arm/mach-s3c2412/gpio.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/gpiolib.c
17 files changed:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/clock.c
arch/arm/mach-exynos4/cpu.c
arch/arm/mach-exynos4/include/mach/map.h
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-exynos4/pm.c
arch/arm/mach-s3c2412/dma.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/mach-smdk6440.c
arch/arm/mach-s5p64x0/mach-smdk6450.c
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/clock.c
arch/arm/plat-s5p/include/plat/pll.h
arch/arm/plat-s5p/irq-gpioint.c
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/include/plat/dma-s3c24xx.h