summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-22 19:35:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-22 19:35:27 -0700
commit77ed402b7f53cbe50ae8384a172a5b9713020400 (patch)
tree43c8aa1a8fb4245e38ed1f22c99c5bc88c7017da
parent21f9debf74c3ae8fdd26fd2bc3c0169a08eba6b4 (diff)
parent44156affd1844bdfd90cc791cf5fdb6f9a04e238 (diff)
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
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 33caa2b3d100..5f83015ff016 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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)