Public Git Hosting - linux-2.6/next.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c9da47e a08b7e1)

commit	a4b7c496f352bf6020a928626d1d7cbee14b10c4
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 31 Aug 2011 01:03:38 +0000 (31 11:03 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 31 Aug 2011 01:03:40 +0000 (31 11:03 +1000)
tree	059ea594927ee15010ff03d6c61d9f1b37a0ca49	tree \| snapshot (tar.gz zip)
parent	c9da47e37197f0e6b46e7d6dcad027c291316387	commit \| diff
parent	a08b7e19811181309da2306338027fe1d3f8001d	commit \| diff

Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c

12 files changed:

arch/arm/mach-exynos4/mach-nuri.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/mach-smdkv310.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/mach-universal_c210.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/cpu.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-crag6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-mini6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-real6410.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c64xx/mach-smdk6410.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-s5pc100/mach-smdkc100.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s5pv210/mach-smdkv210.c	diff1 \|	diff2 \|	blob \| history

linux-next