Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Fri, 15 Jul 2011 14:05:24 +0000 (10:05 -0400)]
Conflicts:
net/bluetooth/l2cap_core.c

1  2 
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/libertas/cmd.c
drivers/net/wireless/libertas/cmdresp.c
drivers/net/wireless/libertas/main.c
include/net/bluetooth/hci_core.h
net/bluetooth/hci_core.c

Simple merge
@@@ -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",
Simple merge
Simple merge
Simple merge
Simple merge