summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/include
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-12-13 07:36:36 +0100
committerPaul Mundt <lethal@linux-sh.org>2010-12-13 07:36:36 +0100
commit598e227ea9af687547d46bff6906151e728f7b7b (patch)
treeda2ae0d84e27971d01eaf192a6b4ef71f0b46d09 /arch/arm/mach-shmobile/include
parentMerge branch 'rmobile/mackerel' into rmobile-latest (diff)
parentARM: mach-shmobile: AG5 clock framework improvements (diff)
parentARM: mach-shmobile: mackerel: Add keypad tca6408a support (diff)
downloadlinux-598e227ea9af687547d46bff6906151e728f7b7b.tar.xz
linux-598e227ea9af687547d46bff6906151e728f7b7b.zip
Merge branches 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest