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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (48 commits)
  [PATCH] bonding: update version number
  [PATCH] git-netdev-all: pc300_tty build fix
  [PATCH] Make PC300 WAN driver compile again
  [PATCH] Modularize generic HDLC
  [PATCH] more s2io __iomem annotations
  [PATCH] restore __iomem annotations in e1000
  [PATCH] 64bit bugs in s2io
  [PATCH] bonding: Fix primary selection error at enslavement time
  [PATCH] bonding: Don't mangle LACPDUs
  [PATCH] bonding: Validate probe replies in ARP monitor
  [PATCH] bonding: Don't release slaves when master is admin down
  [PATCH] bonding: Add priv_flag to avoid event mishandling
  [PATCH] bonding: Handle large hard_header_len
  [PATCH] bonding: Remove unneeded NULL test
  [PATCH] bonding: Format fix in seq_printf call
  [PATCH] bonding: Convert delay value from s16 to int
  [PATCH] bonding: Allow bonding to enslave a 10 Gig adapter
  Delete unused drivers/net/gt64240eth.h
  [PATCH] skge: fiber support
  [PATCH] fix possible NULL ptr deref in forcedeth
  ...

diff --combined drivers/net/wireless/zd1201.c
index f50ec10,a44dda9..80af9a9
--- 1/drivers/net/wireless/zd1201.c
--- 2/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@@ -119,7 -119,7 +119,7 @@@ static void zd1201_usbfree(struct urb *
        switch(urb->status) {
                case -EILSEQ:
                case -ENODEV:
 -              case -ETIMEDOUT:
 +              case -ETIME:
                case -ENOENT:
                case -EPIPE:
                case -EOVERFLOW:
@@@ -201,7 -201,7 +201,7 @@@ static void zd1201_usbrx(struct urb *ur
        switch(urb->status) {
                case -EILSEQ:
                case -ENODEV:
 -              case -ETIMEDOUT:
 +              case -ETIME:
                case -ENOENT:
                case -EPIPE:
                case -EOVERFLOW:
@@@ -1218,7 -1218,7 +1218,7 @@@ static int zd1201_set_essid(struct net_
                return -EINVAL;
        if (data->length < 1)
                data->length = 1;
-       zd->essidlen = data->length-1;
+       zd->essidlen = data->length;
        memset(zd->essid, 0, IW_ESSID_MAX_SIZE+1);
        memcpy(zd->essid, essid, data->length);
        return zd1201_join(zd, zd->essid, zd->essidlen);