diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-13 01:36:36 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-13 01:36:36 -0500 |
| commit | 598e227ea9af687547d46bff6906151e728f7b7b (patch) | |
| tree | da2ae0d84e27971d01eaf192a6b4ef71f0b46d09 /arch/arm/mach-shmobile/include | |
| parent | 2818b19102fdc414248f772c46af176d36520ae7 (diff) | |
| parent | f6d84f4a7df8057247a3f1723169586af3882436 (diff) | |
| parent | cd8ab0041d131e8e210c4b5ded7257da50473dcb (diff) | |
Merge branches 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest