Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Fri, 24 Jun 2011 19:25:51 +0000 (15:25 -0400)]
Conflicts:
drivers/net/wireless/rtlwifi/pci.c
include/linux/netlink.h

14 files changed:
1  2 
drivers/bcma/host_pci.c
drivers/net/b44.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/iwlegacy/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/libertas/if_spi.c
include/linux/netlink.h
include/net/bluetooth/hci_core.h
net/bluetooth/hci_core.c
net/netlink/af_netlink.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -4097,9 -4098,15 +4098,15 @@@ static int b43_phy_versioning(struct b4
                        unsupported = 1;
                break;
  #endif
+ #ifdef CONFIG_B43_PHY_HT
+       case B43_PHYTYPE_HT:
+               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",
@@@ -221,8 -221,8 +222,9 @@@ struct netlink_callback 
        int                     (*dump)(struct sk_buff * skb,
                                        struct netlink_callback *cb);
        int                     (*done)(struct netlink_callback *cb);
 -      int                     family;
 +      u16                     family;
 +      u16                     min_dump_alloc;
+       unsigned int            prev_seq, seq;
        long                    args[6];
  };
  
Simple merge
Simple merge
Simple merge