Merge remote-tracking branch 'v4l-dvb/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Sun, 7 Oct 2012 23:40:20 +0000 (10:40 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Sun, 7 Oct 2012 23:40:20 +0000 (10:40 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:40:20 +0000 (10:40 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:40:20 +0000 (10:40 +1100)
diff --cc arch/arm/mach-davinci/da850.c
Simple merge
diff --cc arch/arm/mach-exynos/mach-nuri.c
Simple merge
diff --cc arch/arm/mach-exynos/mach-origen.c
Simple merge
diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 7 Oct 2012 23:40:20 +0000 (10:40 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 7 Oct 2012 23:40:20 +0000 (10:40 +1100)
		1	2
arch/arm/mach-davinci/da850.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-nuri.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-origen.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos/mach-universal_c210.c	patch \|	diff1 \|	diff2 \|	blob \| history