diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 18:01:32 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 18:01:32 +0100 |
| commit | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (patch) | |
| tree | 8290f03bcd6af331d7a401282028acfeea37d1de | |
| parent | Merge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block (diff) | |
| parent | Merge with http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff) | |
| download | linux-5b2f7ffcb734d3046144dfbd5ac6d76254a9e522.tar.xz linux-5b2f7ffcb734d3046144dfbd5ac6d76254a9e522.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial
| -rw-r--r-- | CREDITS | 6 | ||||
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | ipc/mqueue.c | 2 |
3 files changed, 6 insertions, 8 deletions
@@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005 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 diff --git a/MAINTAINERS b/MAINTAINERS index 3ccbfa96eeec..995bfd8e6e7f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2481,10 +2481,10 @@ L: linux-kernel@vger.kernel.org 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 diff --git a/ipc/mqueue.c b/ipc/mqueue.c index a0f18c9cc89d..c8943b53d8e6 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: |