]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge