diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-02 08:17:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-02 08:17:56 +0200 |
| commit | 936e894a976dd3b0f07f1f6f43c17b77b7e6146d (patch) | |
| tree | 5ed5c1f6735dcd26550594df23c8f7fe2aa21a15 /Documentation/connector/ucon.c | |
| parent | 69575d388603365f2afbf4166df93152df59b165 (diff) | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
Merge commit 'v2.6.31-rc8' into x86/txt
Conflicts:
arch/x86/kernel/reboot.c
security/Kconfig
Merge reason: resolve the conflicts, bump up from rc3 to rc8.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 d738cde2a8d..c5092ad0ce4 100644 --- a/Documentation/connector/ucon.c +++ b/Documentation/connector/ucon.c @@ -1,7 +1,7 @@ /* * ucon.c * - * Copyright (c) 2004+ Evgeniy Polyakov <johnpol@2ka.mipt.ru> + * Copyright (c) 2004+ Evgeniy Polyakov <zbr@ioremap.net> * * * This program is free software; you can redistribute it and/or modify |