From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Apr 2015 17:52:13 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: firefly_0821_release~176^2~2043
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8fa5975900ba4e91e14a63f11fb7a026f60cecd5;p=firefly-linux-kernel-4.4.55.git

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
---

8fa5975900ba4e91e14a63f11fb7a026f60cecd5