summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/Kconfig
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-30 06:50:10 +0100
committerPaul Mundt <lethal@linux-sh.org>2010-11-30 06:50:10 +0100
commit0ae26c8cf71f3c65b69a40d45c48e6c6195ac617 (patch)
tree7db54e5671042ccdb5119204faaf5d39e2338ccb /arch/arm/mach-shmobile/Kconfig
parentMerge branch 'rmobile/mmcif' into rmobile-latest (diff)
parentARM: mach-shmobile: ag5evm: Add FSI resources (diff)
parentMerge branch 'common/mmcif' into rmobile/mmcif (diff)
downloadlinux-0ae26c8cf71f3c65b69a40d45c48e6c6195ac617.tar.xz
linux-0ae26c8cf71f3c65b69a40d45c48e6c6195ac617.zip
Merge branches 'rmobile/ag5' and 'rmobile/mmcif' into rmobile-latest