diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 19:28:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 19:28:49 +0200 |
| commit | 43096597a4cc4bd3f912be8a69dbd12e27e08038 (patch) | |
| tree | 88cb4ba7562b0883aa987ee43f42a6c9bf9cd05f /drivers/net/wireless/wavelan.p.h | |
| parent | arch/m68k/mm/kmap.c: introduce missing kfree (diff) | |
| parent | qlge: Fix page size ifdef test. (diff) | |
| download | linux-43096597a4cc4bd3f912be8a69dbd12e27e08038.tar.xz linux-43096597a4cc4bd3f912be8a69dbd12e27e08038.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
qlge: Fix page size ifdef test.
net: Rationalise email address: Network Specific Parts
dsa: fix compile bug on s390
netns: mib6 section fixlet
enic: Fix Kconfig headline description
de2104x: wrong MAC address fix
s390: claw compile fixlet
net: export genphy_restart_aneg
cxgb3: extend copyrights to 2008
cxgb3: update driver version
net/phy: add missing kernel-doc
pktgen: fix skb leak in case of failure
mISDN/dsp_cmx.c: fix size checks
misdn: use nonseekable_open()
net: fix driver build errors due to missing net/ip6_checksum.h include
Diffstat (limited to 'drivers/net/wireless/wavelan.p.h')
| -rw-r--r-- | drivers/net/wireless/wavelan.p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/net/wireless/wavelan.p.h index b33ac47dd8df..44d31bbf39e4 100644 --- a/drivers/net/wireless/wavelan.p.h +++ b/drivers/net/wireless/wavelan.p.h @@ -186,7 +186,7 @@ * * Thanks go also to: * James Ashton <jaa101@syseng.anu.edu.au>, - * Alan Cox <alan@redhat.com>, + * Alan Cox <alan@lxorguk.ukuu.org.uk>, * Allan Creighton <allanc@cs.usyd.edu.au>, * Matthew Geier <matthew@cs.usyd.edu.au>, * Remo di Giovanni <remo@cs.usyd.edu.au>, |