git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit

]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit

projects / mirror_ubuntu-disco-kernel.git / commit

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 9 Jan 2012 16:14:07 +0000 (16:14 +0000)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 9 Jan 2012 16:14:07 +0000 (16:14 +0000)
commit	142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6
tree	8cced517382b7087df4e89a9e2a00ccac9676a92	tree
parent	155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511	commit \| diff
parent	a07613a54d700a974f3a4a657da78ef5d097315d	commit \| diff

Merge branch 'samsung/cleanup' into samsung/driver

Conflicts:
arch/arm/mach-s5p64x0/cpu.c -> common.c

More changes to a file that got moved into common.c,
see previous conflict resolutions.

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

Ubuntu Disco kernel mirror for Proxmox VE and PMG

RSS Atom

arch/arm/mach-exynos/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/include/mach/map.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/clock-s5p6440.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/clock-s5p6450.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5p64x0/common.c	\|	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