tree 91171ea8afa319ff49d4e78474d882a0341bd4a9
parent 545124e7773fc2f5f0f9574e5763583f7920d872
parent ffeb13aab68e2d0082cbb147dc765beb092f83f4
author Linus Torvalds <torvalds@linux-foundation.org> 1428774733 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1428774733 -0700

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

Pull dmaengine fix from Vinod Koul:
 "I have one more fix to fix the boot warning on cppi driver due to
  missing capabilities"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: cppi41: add missing bitfields