summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-06-16 08:12:08 +0200
committerPaul Mundt <lethal@linux-sh.org>2011-06-16 08:12:08 +0200
commitd0459e1afa58a225f074d85226bf0d7b9e54eff3 (patch)
tree97df2f4f5a073f423903d122b4e9f5fc31e0df1c /arch/sh/kernel
parentMerge branch 'common/serial-rework' into sh-latest (diff)
parentdmaengine: shdma: fixup parameter definition on dmae_set_dmars (diff)
parentsh: sh7724: Add USBHS DMAEngine support (diff)
downloadlinux-d0459e1afa58a225f074d85226bf0d7b9e54eff3.tar.xz
linux-d0459e1afa58a225f074d85226bf0d7b9e54eff3.zip
Merge branches 'common/dma' and 'sh/stable-updates' into sh-latest