From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 May 2015 20:28:24 +0000 (-0700)
Subject: Merge tag 'xtensa-20150526' of git://github.com/czankel/xtensa-linux
X-Git-Tag: v4.1-rc6~16
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=ace6a22a9fbcdba0ccf190f97b82a79ef2f44aeb;p=cascardo%2Flinux.git

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

ace6a22a9fbcdba0ccf190f97b82a79ef2f44aeb