projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 55a7b21 227145e)
Merge branch 'parisc-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jul 2017 00:41:31 +0000 (17:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jul 2017 00:41:31 +0000 (17:41 -0700)
commit9b51f04424e17051a89ab32d892ca66b2a104825
tree919f49ed827de2b37d8f9187cbcc96d9a2cac0c5tree | snapshot
parent55a7b2125cf4739a8478d2d7223310ae7393408ccommit | diff
parent227145eb38fbee9d88a570954b3de836c4280134commit | diff
Merge branch 'parisc-4.13-2' of git://git./linux/kernel/git/deller/parisc-linux

Pull another parisc update from Helge Deller:
 "Christoph Hellwig provided one patch for the parisc architecture to
  drop the DMA_ERROR_CODE define from the parisc architecture"

* 'parisc-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: ->mapping_error
John Crispins staging tree