Merge tag 'xtensa-20150526' of git://github.com/czankel/xtensa-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 May 2015 20:28:24 +0000 (13:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 May 2015 20:28:24 +0000 (13:28 -0700)
commitace6a22a9fbcdba0ccf190f97b82a79ef2f44aeb
tree8e804cad0f8b5a5e45e8bcd78713f6d2632df6a0
parent1263193d1a269b87fe96aecfd7d1d5769da77ef6
parente74993aef4411995960052506a000f94411a7103
Merge tag 'xtensa-20150526' of git://github.com/czankel/xtensa-linux

Pull Xtensa fix from Chris Zankel:
 "This fixes allmodconfig, which fails to build due to missing
  dma_alloc_attrs() and dma_free_attrs() functions"

* tag 'xtensa-20150526' of git://github.com/czankel/xtensa-linux:
  xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs()