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

Conflicts:
	net/bluetooth/l2cap_core.c

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

diff --cc drivers/net/wireless/b43/main.c
index e9a01e3,8bcda50..092dd93
--- 1/drivers/net/wireless/b43/main.c
--- 2/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@@ -4104,9 -4243,15 +4243,15 @@@ static int b43_phy_versioning(struct b4
                        unsupported = 1;
                break;
  #endif
+ #ifdef CONFIG_B43_PHY_LCN
+       case B43_PHYTYPE_LCN:
+               if (phy_rev > 1)
+                       unsupported = 1;
+               break;
+ #endif
        default:
                unsupported = 1;
 -      };
 +      }
        if (unsupported) {
                b43err(dev->wl, "FOUND UNSUPPORTED PHY "
                       "(Analog %u, Type %u, Revision %u)\n",

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

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

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

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

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

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