summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/include/mach
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-12-13 06:36:36 (GMT)
committerPaul Mundt <lethal@linux-sh.org>2010-12-13 06:36:36 (GMT)
commit598e227ea9af687547d46bff6906151e728f7b7b (patch)
treeda2ae0d84e27971d01eaf192a6b4ef71f0b46d09 /arch/arm/mach-shmobile/include/mach
parent2818b19102fdc414248f772c46af176d36520ae7 (diff)
parentf6d84f4a7df8057247a3f1723169586af3882436 (diff)
parentcd8ab0041d131e8e210c4b5ded7257da50473dcb (diff)
downloadlinux-598e227ea9af687547d46bff6906151e728f7b7b.tar.xz
Merge branches 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest