From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Jul 2017 00:41:31 +0000 (-0700)
Subject: Merge branch 'parisc-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9b51f04424e17051a89ab32d892ca66b2a104825;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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
---

9b51f04424e17051a89ab32d892ca66b2a104825