| commit | 2818b19102fdc414248f772c46af176d36520ae7 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Tue Nov 30 14:53:45 2010 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Tue Nov 30 14:53:45 2010 +0900 |
| tree | 0a6f666ab02c12f308de6352a74c8fbc86e36343 | |
| parent | 0ae26c8cf71f3c65b69a40d45c48e6c6195ac617 [diff] | |
| parent | 25338f2e09fcbaa0470841c928bf0e718ca13382 [diff] |
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>