Pandora Sourcecodes - pandora-kernel.git/commit

git.openpandora.org / pandora-kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c9477f3 568f0e2)

author	Kukjin Kim <kgene.kim@samsung.com>
	Tue, 4 Oct 2011 11:18:36 +0000 (20:18 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Tue, 4 Oct 2011 11:18:36 +0000 (20:18 +0900)
commit	db3c94a7edc6b29f8d52ba5884dec6a15feeadad
tree	ac9207a44cecafb9104ca4e1f46aecb9fe01383d	tree \| snapshot
parent	c9477f38cba225870862fd9e08868ae3d4abdfe0	commit \| diff
parent	568f0e278c6dd33dc11bd19c4ad781d1f8d86800	commit \| diff

Merge branch 'next-samsung-devel' into next-samsung-devel-2

Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s3c2412/gpio.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/gpiolib.c

15 files changed:

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-exynos4/pm.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-s5p64x0/mach-smdk6440.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/mach-smdk6450.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

Pandora Kernel Repository