diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-07 21:08:28 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-07 21:08:41 -0700 |
commit | b6741d1fe947f829bd4303397fd888e1d4b66bae (patch) | |
tree | a41c8cf58ddfd82d3083b666479a82df018297f7 /net/netlabel/netlabel_addrlist.h | |
parent | acab460b0f618e1e9663eea8c52ad5edd552ed1d (diff) | |
parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
download | talos-obmc-linux-b6741d1fe947f829bd4303397fd888e1d4b66bae.tar.gz talos-obmc-linux-b6741d1fe947f829bd4303397fd888e1d4b66bae.zip |
Merge 3.1-rc1 into usb-linus
Gives us a good starting point to base patches off of.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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> * */ |