summaryrefslogtreecommitdiffstats
path: root/ipc/msg.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-16 01:43:29 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-16 01:43:29 +0100
commit3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch)
treebaec074db38a5ceaaabbcee76f199acef43bb42a /ipc/msg.c
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentMAINTAINERS: CIFS: add linux-cifs-client@lists.samba.org list (diff)
downloadlinux-3f02d072d46bb409e8ca3cf16c0511f5c21adaf6.tar.xz
linux-3f02d072d46bb409e8ca3cf16c0511f5c21adaf6.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'ipc/msg.c')
-rw-r--r--ipc/msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/msg.c b/ipc/msg.c
index a91b64763b86..fbf757064a32 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -12,7 +12,7 @@
*
* mostly rewritten, threaded and wake-one semantics added
* MSGMAX limit removed, sysctl's added
- * (c) 1999 Manfred Spraul <manfreds@colorfullife.com>
+ * (c) 1999 Manfred Spraul <manfred@colorfullife.com>
*/
#include <linux/capability.h>