Merge tag 'powerpc-4.3-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Oct 2015 09:59:53 +0000 (18:59 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Oct 2015 09:59:53 +0000 (18:59 +0900)
commit8a28d67457b613258aa0578ccece206d166f2b9f
tree54113ea738e9e5fa7aeb133210cdae037eb92783
parenta22c4d7e34402ccdf3414f64c50365436eba7b93
parent977bf062bba3eb8d03f66d5b4e227e5d7ebc1e08
Merge tag 'powerpc-4.3-6' of git://git./linux/kernel/git/powerpc/linux

Pull powerpc fix from Michael Ellerman:
 - powerpc/dma: dma_set_coherent_mask() should not be GPL only from Ben

* tag 'powerpc-4.3-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/dma: dma_set_coherent_mask() should not be GPL only