]> 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)
commitd14fca67249c2ebc9a92b3786756b5564b797d1d
treec8784c47bf9e39b1591db5cd995069753ee35aba
parent15233ab4edf3a990456d7a4a00635895b768a39d
parentabf527d9675b13908c6976e3816eb02aee059ed8
parent0edac876486c7a633b0c29798df2bb60368cf3a3
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