From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Sep 2013 16:54:06 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: firefly_0821_release~176^2~5486
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ac0bc7899afc5b69abff64472e2ac4869fd97ff6;p=firefly-linux-kernel-4.4.55.git

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

Pull slave-dma fix from Vinod Koul:
 "A fix for resolving TI_EDMA driver's build error in allmodconfig to
  have filter function built in""

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dma/Kconfig: TI_EDMA needs to be boolean
---

ac0bc7899afc5b69abff64472e2ac4869fd97ff6