Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  drivers/net/pcmcia/3c589_cs: fix port configuration switcheroo
  sk98lin: resurrect driver
  ucc_geth: fix compilation
  mv643xx_eth: Fix tx_bytes stats calculation
  As struct iw_point is bi-directional payload, we should copy back the content
  [PATCH] bcm43xx: Fix cancellation of work queue crashes
  spidernet: fix interrupt reason recognition
  ehea: fix last_rx update
  ehea: propagate physical port state
  Fix a lock problem in generic phy code
  sky2: restore multicast list on resume and other ops
  atl1: disable broken 64-bit DMA

1 files changed, 38 insertions, 0 deletions

diff --git a/drivers/net/sk98lin/h/skversion.h b/drivers/net/sk98lin/h/skversion.h
new file mode 100644
index 000000000000..a1a7294828e5
--- /dev/null
+++ b/drivers/net/sk98lin/h/skversion.h
@@ -0,0 +1,38 @@
+/******************************************************************************
+ *
+ * Name:        version.h
+ * Project:     GEnesis, PCI Gigabit Ethernet Adapter
+ * Version:     $Revision: 1.5 $
+ * Date:        $Date: 2003/10/07 08:16:51 $
+ * Purpose:     SK specific Error log support
+ *
+ ******************************************************************************/
+
+/******************************************************************************
+ *
+ *      (C)Copyright 1998-2002 SysKonnect GmbH.
+ *      (C)Copyright 2002-2003 Marvell.
+ *
+ *      This program is free software; you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation; either version 2 of the License, or
+ *      (at your option) any later version.
+ *
+ *      The information in this file is provided "AS IS" without warranty.
+ *
+ ******************************************************************************/
+
+#ifdef  lint
+static const char SysKonnectFileId[] = "@(#) (C) SysKonnect GmbH.";
+static const char SysKonnectBuildNumber[] =
+        "@(#)SK-BUILD: 6.23 PL: 01"; 
+#endif  /* !defined(lint) */
+
+#define BOOT_STRING     "sk98lin: Network Device Driver v6.23\n" \
+                        "(C)Copyright 1999-2004 Marvell(R)."
+
+#define VER_STRING      "6.23"
+#define DRIVER_FILE_NAME        "sk98lin"
+#define DRIVER_REL_DATE         "Feb-13-2004"
+
+