diff options
author | David S. Miller | 2011-08-08 08:20:26 +0200 |
---|---|---|
committer | David S. Miller | 2011-08-08 08:20:26 +0200 |
commit | 19fd61785a580c60cba900c5171bfadb57dd5056 (patch) | |
tree | 1e491fb014be0dc03f4b6755bb94e73afd38c455 /net/netlabel/netlabel_addrlist.h | |
parent | netxen: add vlan LRO support (diff) | |
parent | dp83640: increase receive time stamp buffer size (diff) | |
download | kernel-qcow2-linux-19fd61785a580c60cba900c5171bfadb57dd5056.tar.gz kernel-qcow2-linux-19fd61785a580c60cba900c5171bfadb57dd5056.tar.xz kernel-qcow2-linux-19fd61785a580c60cba900c5171bfadb57dd5056.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/netlabel/netlabel_addrlist.h')
-rw-r--r-- | net/netlabel/netlabel_addrlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlabel/netlabel_addrlist.h b/net/netlabel/netlabel_addrlist.h index 2b9644e19de0..fdbc1d2c7352 100644 --- a/net/netlabel/netlabel_addrlist.h +++ b/net/netlabel/netlabel_addrlist.h @@ -6,7 +6,7 @@ * system manages static and dynamic label mappings for network protocols such * as CIPSO and RIPSO. * - * Author: Paul Moore <paul.moore@hp.com> + * Author: Paul Moore <paul@paul-moore.com> * */ |