]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitaf324f161326ec4564b0840aea21ae5994d637b4
treec8784c47bf9e39b1591db5cd995069753ee35aba
parente6fb0913f2dcb9e3b19504367dffa248f1651d6b
parentdfa66f9b2911b32b5e2841d8117ddd67693cd762
parent4170943dca6cedd5402ad6922847d2b0f976b697
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