diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-10 03:10:55 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-10 03:10:55 -0500 |
| commit | f0a217a31a745421df98db0d14ebdadef11d734c (patch) | |
| tree | c8784c47bf9e39b1591db5cd995069753ee35aba /arch | |
| parent | cc9e4fedc77c71fb6edfc2bf84be9b3d5d61dd86 (diff) | |
| parent | 43aa77f40a417ac50ec5b0c94ded527690049c63 (diff) | |
| parent | d06830e7143b178c568aa4ce90b2c0281e7fb1de (diff) | |
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>