diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 17:28:49 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 17:28:49 (GMT) |
commit | 43096597a4cc4bd3f912be8a69dbd12e27e08038 (patch) | |
tree | 88cb4ba7562b0883aa987ee43f42a6c9bf9cd05f /include/linux/if_hippi.h | |
parent | 79aa79bac979323a8cb10438be16d29cf252167d (diff) | |
parent | 485013717020cd8961337309e359d6cef43d6022 (diff) | |
download | linux-fsl-qoriq-43096597a4cc4bd3f912be8a69dbd12e27e08038.tar.xz |
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 'include/linux/if_hippi.h')
-rw-r--r-- | include/linux/if_hippi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_hippi.h b/include/linux/if_hippi.h index 94d31ca..f0f2351 100644 --- a/include/linux/if_hippi.h +++ b/include/linux/if_hippi.h @@ -9,7 +9,7 @@ * * Author: Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> * Donald Becker, <becker@super.org> - * Alan Cox, <alan@redhat.com> + * Alan Cox, <alan@lxorguk.ukuu.org.uk> * Steve Whitehouse, <gw7rrm@eeshack3.swan.ac.uk> * Jes Sorensen, <Jes.Sorensen@cern.ch> * |