diff options
| author | James Morris <jmorris@namei.org> | 2009-08-05 18:55:03 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-05 18:55:03 -0400 |
| commit | 012a5299a29672039f42944a37984558393ef769 (patch) | |
| tree | de0815c67cf4156c32c8b552cd7448387cc391b0 /Documentation/connector/ucon.c | |
| parent | da34d4248bd2013ee64ce51e63ec0ebd1f32b46c (diff) | |
| parent | 90bc1a658a53f8832ee799685703977a450e5af9 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'Documentation/connector/ucon.c')
| -rw-r--r-- | Documentation/connector/ucon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/connector/ucon.c b/Documentation/connector/ucon.c index d738cde2a8d5..c5092ad0ce4b 100644 --- a/Documentation/connector/ucon.c +++ b/Documentation/connector/ucon.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * ucon.c | 2 | * ucon.c |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2004+ Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 4 | * Copyright (c) 2004+ Evgeniy Polyakov <zbr@ioremap.net> |
| 5 | * | 5 | * |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |