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

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

author	Arnd Bergmann <arnd@arndb.de>
	Mon, 9 Jan 2012 16:01:00 +0000 (16:01 +0000)
committer	Arnd Bergmann <arnd@arndb.de>
	Mon, 9 Jan 2012 16:01:00 +0000 (16:01 +0000)
commit	97c49f179d5ff815dc17c4c29fbcbde47aa57b0e
tree	e4bc91713e02fa6d8f08b07de53ea8f905593dfa	tree \| snapshot
parent	c9ccd5498b8f707315bdd5a81824d6c7af735838	commit \| diff
parent	ea8d9ab7dc16f3e7a20d793d8b213159fc906582	commit \| diff

Merge branch 'samsung/dt' into samsung/cleanup

Conflicts:
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pv210/Makefile

Pull in previously resolved conflicts:

The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.

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

18 files changed:

arch/arm/mach-exynos/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-nuri.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdkv310.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-universal_c210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/clock.c	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-s5pc100/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pc100/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-aquila.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-goni.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-smdkv210.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-s3c.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

arch/arm/mach-exynos/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-nuri.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-smdkv310.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-universal_c210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/clock.c	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-s5pc100/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pc100/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-aquila.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-goni.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-smdkv210.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/sdhci-s3c.c	diff1 \|	diff2 \|	blob \| history