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/net/hamradio | |
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/net/hamradio')
-rw-r--r-- | drivers/net/hamradio/6pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index e88209fc2a2b..6cb2bdfd7b19 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -3,7 +3,7 @@ * devices like TTY. It interfaces between a raw TTY and the * kernel's AX.25 protocol layers. * - * Authors: Andreas Könsgen <ajk@iehk.rwth-aachen.de> + * Authors: Andreas Könsgen <ajk@comnets.uni-bremen.de> * Ralf Baechle DL5RB <ralf@linux-mips.org> * * Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by |