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)
commit8fa5975900ba4e91e14a63f11fb7a026f60cecd5
tree91171ea8afa319ff49d4e78474d882a0341bd4a9
parent545124e7773fc2f5f0f9574e5763583f7920d872
parentffeb13aab68e2d0082cbb147dc765beb092f83f4
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