Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest
authorPaul Mundt <lethal@linux-sh.org>
Tue, 10 Jan 2012 08:10:55 +0000 (17:10 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 10 Jan 2012 08:10:55 +0000 (17:10 +0900)
commitf0a217a31a745421df98db0d14ebdadef11d734c
treec8784c47bf9e39b1591db5cd995069753ee35aba
parentcc9e4fedc77c71fb6edfc2bf84be9b3d5d61dd86
parent43aa77f40a417ac50ec5b0c94ded527690049c63
parentd06830e7143b178c568aa4ce90b2c0281e7fb1de
Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest

Conflicts:
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile