From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 Feb 2012 18:54:26 +0000 (-0800)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.12-rc1~3907
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4554c135a0a017f4cd96f7c0612cb7ca78c68d08;p=kernel%2Fkernel-generic.git

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  i.MX SDMA: Fix burstsize settings
  ARM: mach-shmobile: both USB DMAC instances on sh7372 are slave-only
  dma: sh_dma: not all SH DMAC implementations support MEMCPY
  at_hdmac: bugfix for enabling channel irq
  dmaengine: fix missing 'cnt' in ?: in dmatest
---

4554c135a0a017f4cd96f7c0612cb7ca78c68d08