Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

Conflicts:
	drivers/net/wireless/libertas/if_cs.c
	drivers/net/wireless/rtlwifi/pci.c
	net/bluetooth/l2cap_sock.c

diff --cc drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/rc.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/xmit.c
Simple merge

diff --cc drivers/net/wireless/ath/carl9170/carl9170.h
Simple merge

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

diff --cc drivers/net/wireless/libertas/cfg.c
Simple merge

diff --cc drivers/net/wireless/libertas/if_spi.h
Simple merge

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

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

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

diff --cc drivers/net/wireless/rt2x00/rt2x00config.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00usb.h
Simple merge

diff --cc drivers/net/wireless/rtlwifi/base.c
index b259f807ad27b461bd7dccc75ce3b4d9c25001fd,d3666573d6b833b3bbf545c4aeef47d7f225ac80..ccb6da38fe22aff9938b4af119385756fa487210
--- 1/drivers/net/wireless/rtlwifi/base.c
--- 2/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@@ -522,10 -698,10 +698,10 @@@ void rtl_get_tcb_desc(struct ieee80211_
                         *because hw will nerver use hw_rate
                         *when tcb_desc->use_driver_rate = false
                         *so we never set highest N rate here,
 -                       *and N rate will all be controled by FW
 +                       *and N rate will all be controlled by FW
                         *when tcb_desc->use_driver_rate = false
                         */
-                       if (rtlmac->ht_enable) {
+                       if (sta && (sta->ht_cap.ht_supported)) {
                                tcb_desc->hw_rate = _rtl_get_highest_n_rate(hw);
                        } else {
                                if (rtlmac->mode == WIRELESS_MODE_B) {

diff --cc drivers/net/wireless/rtlwifi/regd.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/wifi.h
Simple merge

diff --cc drivers/net/wireless/wl12xx/cmd.c
Simple merge

diff --cc drivers/net/wireless/wl12xx/conf.h
Simple merge

diff --cc drivers/net/wireless/wl12xx/io.h
Simple merge

diff --cc include/net/bluetooth/hci.h
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc net/bluetooth/hci_core.c
Simple merge

diff --cc net/bluetooth/l2cap_core.c
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
index 47394a178bd5e0198a815e1e310dae7c88305ea6,09cc7a0053491c80160855b251acbda436290d25..7c4a9ae9b3ce96cf602c92918039171c6c8fc9e0
--- 1/net/bluetooth/l2cap_sock.c
--- 2/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@@ -678,8 -692,8 +692,8 @@@ static int l2cap_sock_setsockopt(struc
                }
  
                if (opt == BT_FLUSHABLE_OFF) {
-                       struct l2cap_conn *conn = l2cap_pi(sk)->conn;
+                       struct l2cap_conn *conn = chan->conn;
 -                      /* proceed futher only when we have l2cap_conn and
 +                      /* proceed further only when we have l2cap_conn and
                           No Flush support in the LM */
                        if (!conn || !lmp_no_flush_capable(conn->hcon->hdev)) {
                                err = -EINVAL;

diff --cc net/mac80211/ieee80211_i.h
Simple merge

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

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

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