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: 501985c e90a0f3)

author	Arnd Bergmann <arnd@arndb.de>
	Sat, 8 Oct 2011 20:11:19 +0000 (22:11 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Sat, 8 Oct 2011 20:11:19 +0000 (22:11 +0200)
commit	5ecee002c79ed61db6034f329cc388f267f23c96
tree	2986cea2c440a5d3cece15c377678ac6bf853cac	tree \| snapshot
parent	501985c17b0cd44d4a710f5dd6bbd002c9a333e6	commit \| diff
parent	e90a0f3c460406d6a5a698016bc525c3e6968cb6	commit \| diff

Merge branch 'next/cleanup2' into for-next

Conflicts:
arch/arm/plat-s5p/include/plat/pll.h

13 files changed:

arch/arm/mach-s3c2410/mach-h1940.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-anw6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-hmt.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-mini6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-ncp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-real6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smartq5.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smartq7.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6400.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/include/plat/exynos4.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules