diff options
| author | Arjan van de Ven <[email protected]> | 2008-10-17 16:20:26 +0000 |
|---|---|---|
| committer | Arjan van de Ven <[email protected]> | 2008-10-17 16:20:26 +0000 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /net/unix/af_unix.c | |
| parent | DECLARE_PER_CPU needs linux/percpu.h (diff) | |
| parent | {pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol() (diff) | |
| download | kernel-651dab4264e4ba0e563f5ff56f748127246e9065.tar.gz kernel-651dab4264e4ba0e563f5ff56f748127246e9065.zip | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
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, <[email protected]> + * Authors: Alan Cox, <[email protected]> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License |