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

Conflicts:
	include/net/bluetooth/bluetooth.h

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

diff --cc drivers/net/wireless/ath/ath6kl/cfg80211.c
Simple merge

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

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

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

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

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

diff --cc drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Simple merge

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

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

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

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/net/bluetooth/bluetooth.h
index e86af08293a8217153b48a98a4802015376185db,38cd3dab7f1d297359c1b94356f93e13d2012fb9..835f3b229b8450d53f2ec434078dd9a3c0e8be52
--- 1/include/net/bluetooth/bluetooth.h
--- 2/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@@ -77,7 -77,34 +77,34 @@@ struct bt_power 
  #define BT_POWER_FORCE_ACTIVE_OFF 0
  #define BT_POWER_FORCE_ACTIVE_ON  1
  
 -__attribute__((format (printf, 2, 3)))
+ #define BT_CHANNEL_POLICY     10
+ 
+ /* BR/EDR only (default policy)
+  *   AMP controllers cannot be used.
+  *   Channel move requests from the remote device are denied.
+  *   If the L2CAP channel is currently using AMP, move the channel to BR/EDR.
+  */
+ #define BT_CHANNEL_POLICY_BREDR_ONLY          0
+ 
+ /* BR/EDR Preferred
+  *   Allow use of AMP controllers.
+  *   If the L2CAP channel is currently on AMP, move it to BR/EDR.
+  *   Channel move requests from the remote device are allowed.
+  */
+ #define BT_CHANNEL_POLICY_BREDR_PREFERRED     1
+ 
+ /* AMP Preferred
+  *   Allow use of AMP controllers
+  *   If the L2CAP channel is currently on BR/EDR and AMP controller
+  *     resources are available, initiate a channel move to AMP.
+  *   Channel move requests from the remote device are allowed.
+  *   If the L2CAP socket has not been connected yet, try to create
+  *     and configure the channel directly on an AMP controller rather
+  *     than BR/EDR.
+  */
+ #define BT_CHANNEL_POLICY_AMP_PREFERRED               2
+ 
 +__printf(2, 3)
  int bt_printk(const char *level, const char *fmt, ...);
  
  #define BT_INFO(fmt, arg...)   bt_printk(KERN_INFO, pr_fmt(fmt), ##arg)

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

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

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

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

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

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

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

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

diff --cc net/mac80211/agg-tx.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc net/nfc/nci/core.c
Simple merge

diff --cc net/wireless/wext-compat.c
Simple merge