| commit | 9b51f04424e17051a89ab32d892ca66b2a104825 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 05 17:41:31 2017 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 05 17:41:31 2017 -0700 |
| tree | 919f49ed827de2b37d8f9187cbcc96d9a2cac0c5 | |
| parent | 55a7b2125cf4739a8478d2d7223310ae7393408c [diff] | |
| parent | 227145eb38fbee9d88a570954b3de836c4280134 [diff] |
Merge branch 'parisc-4.13-2' of git://git.kernel.org/pub/scm/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