Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	net/mac80211/rc80211_pid_algo.c

diff --cc drivers/net/wireless/b43legacy/main.c
Simple merge

diff --cc drivers/net/wireless/libertas/cmdresp.c
index a0a5dbe,bdc6a1c..5d90b83
--- 1/drivers/net/wireless/libertas/cmdresp.c
--- 2/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@@ -568,13 -566,13 +566,13 @@@ int lbs_process_rx_command(struct lbs_p
        respcmd = le16_to_cpu(resp->command);
        result = le16_to_cpu(resp->result);
  
 -      lbs_deb_host("CMD_RESP: response 0x%04x, seq %d, size %d, jiffies %lu\n",
 +      lbs_deb_cmd("CMD_RESP: response 0x%04x, seq %d, size %d, jiffies %lu\n",
                     respcmd, le16_to_cpu(resp->seqnum), priv->upld_len, jiffies);
 -      lbs_deb_hex(LBS_DEB_HOST, "CMD_RESP", (void *) resp, priv->upld_len);
 +      lbs_deb_hex(LBS_DEB_CMD, "CMD_RESP", (void *) resp, priv->upld_len);
  
-       if (resp->seqnum != resp->seqnum) {
+       if (resp->seqnum != priv->cur_cmd->cmdbuf->seqnum) {
                lbs_pr_info("Received CMD_RESP with invalid sequence %d (expected %d)\n",
-                           le16_to_cpu(resp->seqnum), le16_to_cpu(resp->seqnum));
+                           le16_to_cpu(resp->seqnum), le16_to_cpu(priv->cur_cmd->cmdbuf->seqnum));
                spin_unlock_irqrestore(&priv->driver_lock, flags);
                ret = -1;
                goto done;

diff --cc drivers/net/wireless/p54common.c
index 84cc000,d191e05..63f9bad
--- 1/drivers/net/wireless/p54common.c
--- 2/drivers/net/wireless/p54common.c
+++ b/drivers/net/wireless/p54common.c
@@@ -289,12 -254,9 +294,13 @@@ int p54_parse_eeprom(struct ieee80211_h
                        priv->version = *(u8 *)(entry->data + 1);
                        break;
                case PDR_END:
-                       i = len;
+                       /* make it overrun */
+                       entry_len = len;
                        break;
 +              default:
 +                      printk(KERN_INFO "p54: unknown eeprom code : 0x%x\n",
 +                              le16_to_cpu(entry->code));
 +                      break;
                }
  
                entry = (void *)entry + (entry_len + 1)*2;

diff --cc drivers/net/wireless/p54common.h
Simple merge

diff --cc net/core/neighbour.c
Simple merge

diff --cc net/core/netpoll.c
Simple merge

diff --cc net/ipv4/Kconfig
Simple merge

diff --cc net/ipv4/ipconfig.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/sctp/proc.c
Simple merge