diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-06-16 08:12:08 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-16 08:12:08 +0200 |
commit | d0459e1afa58a225f074d85226bf0d7b9e54eff3 (patch) | |
tree | 97df2f4f5a073f423903d122b4e9f5fc31e0df1c /arch | |
parent | Merge branch 'common/serial-rework' into sh-latest (diff) | |
parent | dmaengine: shdma: fixup parameter definition on dmae_set_dmars (diff) | |
parent | sh: sh7724: Add USBHS DMAEngine support (diff) | |
download | linux-d0459e1afa58a225f074d85226bf0d7b9e54eff3.tar.xz linux-d0459e1afa58a225f074d85226bf0d7b9e54eff3.zip |
Merge branches 'common/dma' and 'sh/stable-updates' into sh-latest