tree b8e8ff87a145a38ec00442b6635ac1d3b24e624a
parent a8787645e14ce7bbc3db9788526ed0be968c0df2
parent 764480413b7206d295eb6ff58efb057d56aff08b
author Linus Torvalds <torvalds@linux-foundation.org> 1378140846 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1378140846 -0700

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