Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial

5b2f7ffc · Linus Torvalds · 333c47c8 · b7c4a9f8 · 5b2f7ffc · 5b2f7ffc
Commit 5b2f7ffc authored Nov 07, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

CREDITS CREDITS +2 -4

MAINTAINERS MAINTAINERS +3 -3

ipc/mqueue.c ipc/mqueue.c +1 -1

No files found.
--- a/CREDITS
+++ b/CREDITS
@@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005
 S: USA
 N: Michal Wronski
-E: wrona@mat.uni.torun.pl
+E: Michal.Wronski@motorola.com
-W: http://www.mat.uni.torun.pl/~wrona
 D: POSIX message queues fs (with K. Benedyczak)
-S: ul. Teczowa 23/12
+S: Krakow
-S: 80-680 Gdansk-Sobieszewo
 S: Poland
 N: Frank Xia

--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2481,10 +2481,10 @@ L:	linux-kernel@vger.kernel.org
 S:	Maintained
 TRIVIAL PATCHES
-P:      Rusty Russell
+P:      Adrian Bunk
-M:      trivial@rustcorp.com.au
+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

--- 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: