diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-06 02:41:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-06 02:41:31 +0200 |
| commit | 9b51f04424e17051a89ab32d892ca66b2a104825 (patch) | |
| tree | 919f49ed827de2b37d8f9187cbcc96d9a2cac0c5 /fs/gfs2 | |
| parent | Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff) | |
| parent | parisc: ->mapping_error (diff) | |
| download | linux-9b51f04424e17051a89ab32d892ca66b2a104825.tar.xz linux-9b51f04424e17051a89ab32d892ca66b2a104825.zip | |
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
Diffstat (limited to 'fs/gfs2')
0 files changed, 0 insertions, 0 deletions