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

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index ec871f646766..c41d68761364 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -29,7 +29,8 @@
  *
  *      Tigran Aivazian <tigran@sco.com>:       TLan_PciProbe() now uses
  *                                              new PCI BIOS interface.
- *      Alan Cox        <alan@redhat.com>:      Fixed the out of memory
+ *      Alan Cox        <alan@lxorguk.ukuu.org.uk>:
+ *                                              Fixed the out of memory
  *                                              handling.
  *
  *      Torben Mathiasen <torben.mathiasen@compaq.com> New Maintainer!