aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/Kconfig
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-30 14:50:10 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-11-30 14:50:10 +0900
commit0ae26c8cf71f3c65b69a40d45c48e6c6195ac617 (patch)
tree7db54e5671042ccdb5119204faaf5d39e2338ccb /arch/arm/mach-shmobile/Kconfig
parent1ad2096c4eba144522d87541c4024b8c84e95051 (diff)
parent208c7dc2727ec0fbc678da5e749bcc178c08463d (diff)
parentd8e7943d821d8ee7f48ff38f6f7c509297c88402 (diff)
Merge branches 'rmobile/ag5' and 'rmobile/mmcif' into rmobile-latest