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

Conflicts:
	drivers/net/wireless/rtlwifi/pci.c
	include/linux/netlink.h

diff --cc drivers/bcma/host_pci.c
Simple merge

diff --cc drivers/net/b44.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc include/linux/netlink.h
index fdd0188a167e66be30e54c18ab31c21ec5d4c762,8d1bcec5cc06f63b70d115c016eda787335fabcf..2e17c5dbdcb8a97b0e243868e43179d599637e18
--- 1/include/linux/netlink.h
--- 2/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@@ -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];
  };
  

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

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

diff --cc net/netlink/af_netlink.c
Simple merge