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

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/e1000e/e1000.h
Simple merge

diff --cc drivers/net/e1000e/ich8lan.c
Simple merge

diff --cc drivers/net/e1000e/netdev.c
Simple merge

diff --cc drivers/net/igbvf/netdev.c
Simple merge

diff --cc drivers/net/ixgb/ixgb_main.c
Simple merge

diff --cc drivers/net/ixgbe/Makefile
Simple merge

diff --cc drivers/net/ixgbe/ixgbe.h
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_82599.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_common.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_ethtool.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ixgbe/ixgbe_type.h
Simple merge

diff --cc drivers/net/mlx4/main.c
Simple merge

diff --cc drivers/net/s2io.c
Simple merge

diff --cc drivers/net/sky2.c
Simple merge

diff --cc drivers/net/tg3.c
Simple merge

diff --cc drivers/net/tg3.h
Simple merge

diff --cc drivers/net/ucc_geth.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-5000.c
index c3f8ec0a38b1b55fe7f30edd8a7476491a56679b,de45f308b7440a56024ea5b54491633c4628398f..c6120f0b8f98d0aabf48e4439501e099938e7c5f
--- 1/drivers/net/wireless/iwlwifi/iwl-5000.c
--- 2/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@@ -1600,7 -1598,9 +1600,8 @@@ struct iwl_cfg iwl5300_agn_cfg = 
        .use_bsm = false,
        .ht_greenfield_support = true,
        .led_compensation = 51,
+       .use_rts_for_ht = true, /* use rts/cts protection */
        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -      .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5100_bgn_cfg = {
@@@ -1668,7 -1669,9 +1670,8 @@@ struct iwl_cfg iwl5100_agn_cfg = 
        .use_bsm = false,
        .ht_greenfield_support = true,
        .led_compensation = 51,
+       .use_rts_for_ht = true, /* use rts/cts protection */
        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -      .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5350_agn_cfg = {
@@@ -1691,7 -1694,9 +1694,8 @@@
        .use_bsm = false,
        .ht_greenfield_support = true,
        .led_compensation = 51,
+       .use_rts_for_ht = true, /* use rts/cts protection */
        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -      .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5150_agn_cfg = {
@@@ -1714,7 -1719,9 +1718,8 @@@
        .use_bsm = false,
        .ht_greenfield_support = true,
        .led_compensation = 51,
+       .use_rts_for_ht = true, /* use rts/cts protection */
        .chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
 -      .sm_ps_mode = WLAN_HT_CAP_SM_PS_DISABLED,
  };
  
  struct iwl_cfg iwl5150_abg_cfg = {

diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-dev.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-devtrace.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-devtrace.h
Simple merge

diff --cc drivers/net/wireless/p54/p54pci.c
Simple merge

diff --cc drivers/net/wireless/zd1211rw/zd_usb.c
Simple merge

diff --cc lib/vsprintf.c
index add0446dd921d824f174d975f2e62e0374a34f18,3b8aeec4e32762c3066f8ec633ec0baed99e746e..af4aaa6c36f36c924d9a63da70f84e2b3459fca1
--- 1/lib/vsprintf.c
--- 2/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@@ -936,9 -902,8 +936,9 @@@ static char *uuid_string(char *buf, cha
   * - 'i' [46] for 'raw' IPv4/IPv6 addresses
   *       IPv6 omits the colons (01020304...0f)
   *       IPv4 uses dot-separated decimal with leading 0's (010.123.045.006)
 + * - '[Ii]4[hnbl]' IPv4 addresses in host, network, big or little endian order
   * - 'I6c' for IPv6 addresses printed as specified by
-  *       http://www.ietf.org/id/draft-kawamura-ipv6-text-representation-03.txt
+  *       http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00
   * - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form
   *       "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
   *       Options for %pU are:

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

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/mac80211/mlme.c
index a82564e73d91799d973b3b3a68c19d8ec5ac1d58,05a18f43e1bf73fd34f029b1e35aa0a0193f7162..1e1d16c55ee57be5e9c4366d7c8094454e943e5d
--- 1/net/mac80211/mlme.c
--- 2/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -1478,10 -1963,12 +1478,12 @@@ static void ieee80211_sta_rx_queued_mgm
                        rma = ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len);
                        break;
                case IEEE80211_STYPE_ACTION:
-                       /* XXX: differentiate, can only happen for CSA now! */
+                       if (mgmt->u.action.category != WLAN_CATEGORY_SPECTRUM_MGMT)
+                               break;
+ 
                        ieee80211_sta_process_chanswitch(sdata,
                                        &mgmt->u.action.u.chan_switch.sw_elem,
 -                                      ifmgd->associated);
 +                                      (void *)ifmgd->associated->priv);
                        break;
                }
                mutex_unlock(&ifmgd->mtx);

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

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

diff --cc net/wireless/sme.c
Simple merge