]> git.karo-electronics.de Git - mv-sheeva.git/commit
Merge branch 'rmobile/mackerel' into rmobile-latest
authorPaul Mundt <lethal@linux-sh.org>
Tue, 30 Nov 2010 05:53:45 +0000 (14:53 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 30 Nov 2010 05:53:45 +0000 (14:53 +0900)
commit2818b19102fdc414248f772c46af176d36520ae7
tree0a6f666ab02c12f308de6352a74c8fbc86e36343
parent0ae26c8cf71f3c65b69a40d45c48e6c6195ac617
parent25338f2e09fcbaa0470841c928bf0e718ca13382
Merge branch 'rmobile/mackerel' 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