Commits
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>
Showing diff to43aa77f40a4
Paul Mundt committed cc9e4fedc77MMerge branch 'rmobile/bonito' into rmobile-latest- Paul Mundt committed 43aa77f40a4ARM: mach-shmobile: Add kota2 defconfig. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
- Paul Mundt committed d06830e7143ARM: mach-shmobile: Add marzen defconfig. Signed-off-by: Paul Mundt <lethal@linux-sh.org>