From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Feb 2019 00:12:01 +0000 (-0800)
Subject: Merge branch 'parisc-5.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8456e98e18f35f4d4376e8ff3110a3342f81ce9b;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'parisc-5.0-1' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
 "Fix ptrace syscall number modification which has been broken since
  kernel v4.5 and provide alternative email addresses for the remaining
  users of the retired parisc-linux.org email domain"

* 'parisc-5.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  CREDITS/MAINTAINERS: Retire parisc-linux.org email domain
  parisc: Fix ptrace syscall number modification
---

8456e98e18f35f4d4376e8ff3110a3342f81ce9b