summaryrefslogtreecommitdiff
path: root/net/unix/af_unix.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-17 12:25:43 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-17 12:25:43 +0200
commit0f1f6dec9593c8319714c927dafb443548a1452a (patch)
tree74f887dc86747523e82f08900501073f451996cc /net/unix/af_unix.c
parent8cd162ce230b154e564a1285bb5f89fcf73f0dce (diff)
parent2e532d68a2b3e2aa6b19731501222069735c741c (diff)
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'net/unix/af_unix.c')
-rw-r--r--net/unix/af_unix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 015606b54d9b..c647aab8d418 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1,7 +1,7 @@
/*
* NET4: Implementation of BSD Unix domain sockets.
*
- * Authors: Alan Cox, <alan.cox@linux.org>
+ * Authors: Alan Cox, <alan@lxorguk.ukuu.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License