Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Dec 2009 21:46:29 +0000 (13:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Dec 2009 21:46:29 +0000 (13:46 -0800)
commit05a625486efc3209ae4d98e253dafa6ce0124385
treeb78b4a854639fecc91598ecb05900c929a6ab85e
parent1f11abc966b82b9fd0c834707486ef301b2f398d
parentf80ca163d65903276bec7045a484a79c0897eb2d
Merge branch 'fixes' of git://git./linux/kernel/git/djbw/async_tx

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  drivers/dma: Correct use after free
  drivers/dma: drop unnecesary memset
  ioat2,3: put channel hardware in known state at init
  async_tx: expand async raid6 test to cover ioatdma corner case
  ioat3: fix p-disabled q-continuation
  sh: fix DMA driver's descriptor chaining and cookie assignment
  dma: at_hdmac: correct incompatible type for argument 1 of 'spin_lock_bh'
drivers/dma/at_hdmac.c
drivers/dma/dw_dmac.c