diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 06:50:10 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 06:50:10 +0100 |
commit | 0ae26c8cf71f3c65b69a40d45c48e6c6195ac617 (patch) | |
tree | 7db54e5671042ccdb5119204faaf5d39e2338ccb /arch/arm/mach-shmobile/Kconfig | |
parent | Merge branch 'rmobile/mmcif' into rmobile-latest (diff) | |
parent | ARM: mach-shmobile: ag5evm: Add FSI resources (diff) | |
parent | Merge branch 'common/mmcif' into rmobile/mmcif (diff) | |
download | linux-0ae26c8cf71f3c65b69a40d45c48e6c6195ac617.tar.xz linux-0ae26c8cf71f3c65b69a40d45c48e6c6195ac617.zip |
Merge branches 'rmobile/ag5' and 'rmobile/mmcif' into rmobile-latest