aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 09:01:32 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 09:01:32 -0800
commit5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (patch)
tree8290f03bcd6af331d7a401282028acfeea37d1de /ipc
parentMerge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block (diff)
parentMerge with http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff)
downloadlinux-dev-5b2f7ffcb734d3046144dfbd5ac6d76254a9e522.tar.xz
linux-dev-5b2f7ffcb734d3046144dfbd5ac6d76254a9e522.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'ipc')
-rw-r--r--ipc/mqueue.c2
1 files changed, 1 insertions, 1 deletions
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: