Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu update from Greg Ungerer:
 "Only a single change to update my email address in the MAINTAINERS
  file"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: change m68knommu maintainer email address
This commit is contained in:
Linus Torvalds 2016-05-22 19:35:27 -07:00
commit 77ed402b7f

View file

@ -11518,7 +11518,8 @@ F: Documentation/filesystems/ubifs.txt
F: fs/ubifs/
UCLINUX (M68KNOMMU AND COLDFIRE)
M: Greg Ungerer <gerg@uclinux.org>
M: Greg Ungerer <gerg@linux-m68k.org>
W: http://www.linux-m68k.org/
W: http://www.uclinux.org/
L: linux-m68k@lists.linux-m68k.org
L: uclinux-dev@uclinux.org (subscribers-only)