diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-06-16 15:12:08 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-16 15:12:08 +0900 |
| commit | d0459e1afa58a225f074d85226bf0d7b9e54eff3 (patch) | |
| tree | 97df2f4f5a073f423903d122b4e9f5fc31e0df1c /arch/sh/include | |
| parent | 1f83812d61de8c09ad6ab6be29e0ebd0817d16f1 (diff) | |
| parent | 090b91805a97f58a7deff0f2b40aad1cc2f1b7e0 (diff) | |
| parent | 261a9af671a79b750cb170bac620601d686535c1 (diff) | |
Merge branches 'common/dma' and 'sh/stable-updates' into sh-latest