Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Apr 2015 17:52:13 +0000 (10:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Apr 2015 17:52:13 +0000 (10:52 -0700)
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


Trivial merge