diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /net/appletalk | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'net/appletalk')
| -rw-r--r-- | net/appletalk/ddp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 0c850427a85b..d3134e7e6ee8 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * DDP: An implementation of the AppleTalk DDP protocol for | 2 | * DDP: An implementation of the AppleTalk DDP protocol for |
| 3 | * Ethernet 'ELAP'. | 3 | * Ethernet 'ELAP'. |
| 4 | * | 4 | * |
| 5 | * Alan Cox <Alan.Cox@linux.org> | 5 | * Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 6 | * | 6 | * |
| 7 | * With more than a little assistance from | 7 | * With more than a little assistance from |
| 8 | * | 8 | * |
| @@ -1934,6 +1934,6 @@ static void __exit atalk_exit(void) | |||
| 1934 | module_exit(atalk_exit); | 1934 | module_exit(atalk_exit); |
| 1935 | 1935 | ||
| 1936 | MODULE_LICENSE("GPL"); | 1936 | MODULE_LICENSE("GPL"); |
| 1937 | MODULE_AUTHOR("Alan Cox <Alan.Cox@linux.org>"); | 1937 | MODULE_AUTHOR("Alan Cox <alan@lxorguk.ukuu.org.uk>"); |
| 1938 | MODULE_DESCRIPTION("AppleTalk 0.20\n"); | 1938 | MODULE_DESCRIPTION("AppleTalk 0.20\n"); |
| 1939 | MODULE_ALIAS_NETPROTO(PF_APPLETALK); | 1939 | MODULE_ALIAS_NETPROTO(PF_APPLETALK); |