diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-12-13 07:36:36 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-13 07:36:36 +0100 |
commit | 598e227ea9af687547d46bff6906151e728f7b7b (patch) | |
tree | da2ae0d84e27971d01eaf192a6b4ef71f0b46d09 /arch/arm/mach-shmobile/include | |
parent | Merge branch 'rmobile/mackerel' into rmobile-latest (diff) | |
parent | ARM: mach-shmobile: AG5 clock framework improvements (diff) | |
parent | ARM: mach-shmobile: mackerel: Add keypad tca6408a support (diff) | |
download | linux-598e227ea9af687547d46bff6906151e728f7b7b.tar.xz linux-598e227ea9af687547d46bff6906151e728f7b7b.zip |
Merge branches 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest