git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 19 Mar 2012 20:52:33 +0000 (20:52 +0000)
committer	Arnd Bergmann <arnd@arndb.de>
	Tue, 20 Mar 2012 10:07:48 +0000 (10:07 +0000)
commit	51a45a48fb61024a1e3a9d9f0add02d500f92180
tree	782fa01306ada3e084bd3c47ea1af378b97c0e16	tree \| snapshot
parent	9929c95b5ad02997387d28cd99596577dac3fb16	commit \| diff
parent	1025417985843fd7bdba9a5ec96ef2b5cc60fd72	commit \| diff

Merge branch 'samsung/cleanup-exynos-clock' into next/soc

Conflicts:
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock.c

The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Linux Kernel Source Tree.

RSS Atom

arch/arm/mach-exynos/clock-exynos4.c	\|	diff2 \|	blob \| history
arch/arm/mach-exynos/common.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-universal_c210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/pm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2440/mach-gta02.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2440/mach-rx1950.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/devs.c	diff1 \|	diff2 \|	blob \| history