diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-24 04:03:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-24 04:03:51 +0200 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /drivers/connector/cn_queue.c | |
| parent | Fix typos in comments in via-velocity header. (diff) | |
| parent | ixgbe: remove unnecessary call to device_init_wakeup (diff) | |
| download | linux-74d154189d597b91da4322996dbf4f5c3d1544ab.tar.xz linux-74d154189d597b91da4322996dbf4f5c3d1544ab.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'drivers/connector/cn_queue.c')
| -rw-r--r-- | drivers/connector/cn_queue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c index d478aefcd3be..4a1dfe1f4ba9 100644 --- a/drivers/connector/cn_queue.c +++ b/drivers/connector/cn_queue.c @@ -1,7 +1,7 @@ /* * cn_queue.c * - * 2004-2005 Copyright (c) Evgeniy Polyakov <johnpol@2ka.mipt.ru> + * 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net> * All rights reserved. * * This program is free software; you can redistribute it and/or modify |