diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 00:45:28 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 00:45:28 -0400 |
| commit | 77c7ee51a062bb595c501ec098125a68999c20c3 (patch) | |
| tree | c5060ca5786ef353e005dae04b61d2c49967284d /net/netlabel/netlabel_kapi.c | |
| parent | 1ba762209491e2496e58baffa3fd65d661f54404 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Conflicts:
drivers/tty/serial/sh-sci.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'net/netlabel/netlabel_kapi.c')
| -rw-r--r-- | net/netlabel/netlabel_kapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c index b528dd928d3c..58107d060846 100644 --- a/net/netlabel/netlabel_kapi.c +++ b/net/netlabel/netlabel_kapi.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * system manages static and dynamic label mappings for network protocols such | 5 | * system manages static and dynamic label mappings for network protocols such |
| 6 | * as CIPSO and RIPSO. | 6 | * as CIPSO and RIPSO. |
| 7 | * | 7 | * |
| 8 | * Author: Paul Moore <paul.moore@hp.com> | 8 | * Author: Paul Moore <paul@paul-moore.com> |
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||