Linus Torvalds 9b51f04424 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

2017-07-05 17:41:31 -07:00

..

asm

parisc: ->mapping_error

2017-07-05 21:46:42 +02:00

uapi/asm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2017-07-05 12:31:59 -07:00