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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 994c0e9 cfaf8fc)

author	Kukjin Kim <kgene.kim@samsung.com>
	Wed, 2 Nov 2011 10:12:07 +0000 (19:12 +0900)
committer	Kukjin Kim <kgene.kim@samsung.com>
	Wed, 2 Nov 2011 10:12:07 +0000 (19:12 +0900)
commit	65b68b2a61fe4bad64b81ad399f213b3643a85e0
tree	8ad80b776204734ee43e0763a9c7118598786a78	tree \| snapshot
parent	994c0e992522c123298b4a91b72f5e67ba2d1123	commit \| diff
parent	cfaf8fc5b59527281e9ddc2e0e04e1127936e17f	commit \| diff

Merge remote branch 'arm-soc/next/cleanup3' into next-samsung-dt

Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile

15 files changed:

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2410/s3c2410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2416/s3c2416.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2440/s3c2440.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c2440/s3c2442.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s5p/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-s5p/irq-gpioint.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/include/plat/irqs.h	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/s3cmci.c	diff1 \|	diff2 \|	blob \| history
sound/soc/samsung/ac97.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules