git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Kukjin Kim <kgene.kim@samsung.com>
	Mon, 19 Sep 2011 07:57:12 +0000 (16:57 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Mon, 19 Sep 2011 07:57:12 +0000 (16:57 +0900)
commit	87988b8726aa9a9e62c0a44c2306236b67439064
tree	648da019d526cf7e0d9bc407826eb73ab5b223a3	tree \| snapshot
parent	7e9ff3cb4224ebbb21b5ce4e1b62142cb41c842e	commit \| diff
parent	3d5894c16f3241cd52dd352b1d0a12f1dca77ef2	commit \| diff

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-s5p64x0/dma.c

12 files changed:

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/mach-exynos4/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/include/mach/map.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/mach-smdkv310.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2412/dma.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/dma.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s5p/include/plat/pll.h	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/include/plat/dma-s3c24xx.h	diff1 \|	diff2 \|	blob \| history