diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-10 09:10:55 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-10 09:10:55 +0100 |
| commit | f0a217a31a745421df98db0d14ebdadef11d734c (patch) | |
| tree | c8784c47bf9e39b1591db5cd995069753ee35aba /arch | |
| parent | Merge branch 'rmobile/bonito' into rmobile-latest (diff) | |
| parent | ARM: mach-shmobile: Add kota2 defconfig. (diff) | |
| parent | ARM: mach-shmobile: Add marzen defconfig. (diff) | |
| download | linux-f0a217a31a745421df98db0d14ebdadef11d734c.tar.xz linux-f0a217a31a745421df98db0d14ebdadef11d734c.zip | |
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>