]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'dmaengine-fixes-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Feb 2014 21:18:57 +0000 (13:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Feb 2014 21:18:57 +0000 (13:18 -0800)
Pull dmaengine fixes from Dan Williams:
 "Fix tasklet lifetime management in the ioat driver causing ksoftirqd
  to spin indefinitely.

    References:
    https://lkml.org/lkml/2014/1/27/282
    https://lkml.org/lkml/2014/2/19/672"

* tag 'dmaengine-fixes-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
  ioat: fix tasklet tear down


Trivial merge