summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-01-05 17:25:29 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-01-05 17:25:29 +0900
commit025a10a76808cfd9e55dbf965d0f1453e4f8ae84 (patch)
tree32f4f73efad9559b4fb83628e4f65d2c6bc062e3 /arch/arm/mach-shmobile
parent6bf45a1018ff3cda8b6ef2fa7e023a023bc01dc8 (diff)
parentf7dd3611c85f50a98e8f3b9b1d52aaf540ebeb7b (diff)
parentc070c203cde0e019cd373d3247137be11961deb3 (diff)
parentd0fb0c4b3fc9b31cc635e89b6a2f9aaa30bf75db (diff)
Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest
Conflicts: arch/arm/mach-shmobile/Kconfig Signed-off-by: Paul Mundt <lethal@linux-sh.org>