Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Oct 2010 11:27:34 +0000 (12:27 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Oct 2010 11:27:34 +0000 (12:27 +0100)
commitf9cef506815386df4bd7e463b59e0a0984ce0355
treeb26a202b2f0472e3ebe889012312b115917717f9
parent9ae21ca362679757786f5abe556c7943e9001426
parentcbff3eb3e6e3c618583a7435f87c1548aa12b0ad
Merge branch 'for-rmk' of git://git./linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
arch/arm/mach-s3c64xx/dev-audio.c
arch/arm/Kconfig
arch/arm/mach-s3c64xx/dev-audio.c
arch/arm/mach-s3c64xx/mach-real6410.c
arch/arm/mach-s5pc100/mach-smdkc100.c
arch/arm/mach-s5pv210/mach-aquila.c
arch/arm/mach-s5pv210/mach-goni.c
arch/arm/mach-s5pv210/mach-smdkc110.c
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/mach-s5pv310/mach-smdkv310.c
arch/arm/mach-s5pv310/mach-universal_c210.c
arch/arm/plat-samsung/include/plat/devs.h