Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 7 Sep 2012 19:07:55 +0000 (15:07 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 7 Sep 2012 19:07:55 +0000 (15:07 -0400)
commitfac805f8c198092de9a2842efd7f5022e2937b18
tree7557809c373f97a343c427d8fded0696060394ce
parent2461c7d60f9f3821274e4acf9019cba8b82c94b5
parentf10723841e624c0726c70356b31d91befed01dd6
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
35 files changed:
drivers/bcma/host_pci.c
drivers/bluetooth/btusb.c
drivers/net/wireless/at76c50x-usb.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/mac80211-ops.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
drivers/net/wireless/brcm80211/brcmfmac/usb.c
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/iwlwifi/dvm/debugfs.c
drivers/net/wireless/iwlwifi/pcie/internal.h
drivers/net/wireless/iwlwifi/pcie/rx.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/mwifiex/cmdevt.c
drivers/net/wireless/rt2x00/rt2x00dev.c
include/linux/bcma/bcma_driver_chipcommon.h
include/net/bluetooth/smp.h
include/net/cfg80211.h
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/sco.c
net/mac80211/cfg.c
net/mac80211/mesh.c
net/mac80211/mlme.c
net/mac80211/scan.c
net/mac80211/tx.c
net/wireless/core.c
net/wireless/nl80211.c
net/wireless/reg.c
net/wireless/util.c