commit b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2
author Adrian Bunk <bunk@stusta.de> Mon Nov 07 12:26:59 2005 +0100
committer Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> Mon Nov 07 12:26:59 2005 +0100
tree 66bf5c66ed505a739bf8633d1931f0d0526bd6d6
parent 65163fd73c65e4c61437c28ac4ef9f3c5ba16a80
parent 0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26

Merge with http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

CREDITS

diff --git a/CREDITS b/CREDITS
index 5b1edf3..7fb4c73 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3642,11 +3642,9 @@
 S: USA
 
 N: Michal Wronski
-E: wrona@mat.uni.torun.pl
-W: http://www.mat.uni.torun.pl/~wrona
+E: Michal.Wronski@motorola.com
 D: POSIX message queues fs (with K. Benedyczak)
-S: ul. Teczowa 23/12
-S: 80-680 Gdansk-Sobieszewo
+S: Krakow
 S: Poland
 
 N: Frank Xia

MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d57c491..08dd21f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2455,10 +2455,10 @@
 S:	Maintained
 
 TRIVIAL PATCHES
-P:      Rusty Russell
-M:      trivial@rustcorp.com.au
+P:      Adrian Bunk
+M:      trivial@kernel.org
 L:      linux-kernel@vger.kernel.org
-W:      http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/
+W:      http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
 S:      Maintained
 
 TMS380 TOKEN-RING NETWORK DRIVER

ipc/mqueue.c

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index a0f18c9..c8943b5 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -2,7 +2,7 @@
  * POSIX message queues filesystem for Linux.
  *
  * Copyright (C) 2003,2004  Krzysztof Benedyczak    (golbi@mat.uni.torun.pl)
- *                          Michal Wronski          (wrona@mat.uni.torun.pl)
+ *                          Michal Wronski          (Michal.Wronski@motorola.com)
  *
  * Spinlocks:               Mohamed Abbas           (abbas.mohamed@intel.com)
  * Lockless receive & send, fd based notify: