[2.6 patch] GIT trivial tree

From: Adrian Bunk
Date: Mon Nov 07 2005 - 11:51:28 EST


Linus, please do an update from:

http://www.kernel.org/pub/scm/linux/kernel/git/bunk/trivial.git

I've taken over the trivial patch monkey from Rusty, and I'll send the
really trivial patches like spelling corrections through this tree.

Is this tree OK or are there any problems with it?

Full patches currently in the tree below.


Adrian Bunk:
I am the new monkey.
Merge with http://www.kernel.org/.../torvalds/linux-2.6.git

Michal Wronski:
Update Michal Wronski contact info


CREDITS | 6 ++----
MAINTAINERS | 6 +++---
ipc/mqueue.c | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CREDITS b/CREDITS
index 5b1edf3..7fb4c73 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005
S: USA

N: Michal Wronski
-E: wrona@xxxxxxxxxxxxxxxx
-W: http://www.mat.uni.torun.pl/~wrona
+E: Michal.Wronski@xxxxxxxxxxxx
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
diff --git a/MAINTAINERS b/MAINTAINERS
index d57c491..08dd21f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2455,10 +2455,10 @@ L: linux-kernel@xxxxxxxxxxxxxxx
S: Maintained

TRIVIAL PATCHES
-P: Rusty Russell
-M: trivial@xxxxxxxxxxxxxxx
+P: Adrian Bunk
+M: trivial@xxxxxxxxxx
L: linux-kernel@xxxxxxxxxxxxxxx
-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
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@xxxxxxxxxxxxxxxx)
- * Michal Wronski (wrona@xxxxxxxxxxxxxxxx)
+ * Michal Wronski (Michal.Wronski@xxxxxxxxxxxx)
*
* Spinlocks: Mohamed Abbas (abbas.mohamed@xxxxxxxxx)
* Lockless receive & send, fd based notify:

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/