Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77ed402b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 21f9debf 44156aff

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -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)