git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
include
/
net
/
cipso_ipv4.h
diff --git
a/include/net/cipso_ipv4.h
b/include/net/cipso_ipv4.h
index
3b93874
..
9808877
100644
(file)
--- a/
include/net/cipso_ipv4.h
+++ b/
include/net/cipso_ipv4.h
@@
-8,7
+8,7
@@
* have chosen to adopt the protocol and over the years it has become a
* de-facto standard for labeled networking.
*
- * Author: Paul Moore <paul
.moore@hp
.com>
+ * Author: Paul Moore <paul
@paul-moore
.com>
*
*/