diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 13:28:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 13:28:49 -0400 |
| commit | 43096597a4cc4bd3f912be8a69dbd12e27e08038 (patch) | |
| tree | 88cb4ba7562b0883aa987ee43f42a6c9bf9cd05f /drivers/net/pcmcia/3c589_cs.c | |
| parent | 79aa79bac979323a8cb10438be16d29cf252167d (diff) | |
| parent | 485013717020cd8961337309e359d6cef43d6022 (diff) | |
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/pcmcia/3c589_cs.c')
| -rw-r--r-- | drivers/net/pcmcia/3c589_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index 0b28d0d8ffa8..c235cdba69c6 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | incorporated herein by reference. | 15 | incorporated herein by reference. |
| 16 | Donald Becker may be reached at becker@scyld.com | 16 | Donald Becker may be reached at becker@scyld.com |
| 17 | 17 | ||
| 18 | Updated for 2.5.x by Alan Cox <alan@redhat.com> | 18 | Updated for 2.5.x by Alan Cox <alan@lxorguk.ukuu.org.uk> |
| 19 | 19 | ||
| 20 | ======================================================================*/ | 20 | ======================================================================*/ |
| 21 | 21 | ||