Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next

[~andy/linux] / net / netlabel / netlabel_user.c

diff --git a/net/netlabel/netlabel_user.c b/net/netlabel/netlabel_user.c
index a3fd75ac3fa50187bd7ff6924700569b2b1cebc4..9fae63f102980e2e789c2d8b06baf9594f1cb4b6 100644 (file)
--- a/net/netlabel/netlabel_user.c
+++ b/net/netlabel/netlabel_user.c
@@ -5,7 +5,7 @@
  * NetLabel 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>
  *
  */