]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Mar 2013 20:41:36 +0000 (16:41 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Mar 2013 20:41:36 +0000 (16:41 -0400)
commit9a574cd67a447059f9c14bbef47873315d7f7b35
tree0ebb71d213d868d8884b1fa0e05b7393c66c665b
parent689b66cb53fbb5d567aa4e095eaa828aff73aef0
parent2e1253d640eb7f8707d2591c93097c1e9f9c71d5
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Conflicts:
net/mac80211/sta_info.c
net/wireless/core.h
24 files changed:
MAINTAINERS
drivers/net/wireless/ath/ath9k/ar9003_calib.c
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
drivers/net/wireless/iwlegacy/3945-mac.c
drivers/net/wireless/iwlwifi/dvm/lib.c
drivers/net/wireless/iwlwifi/dvm/ucode.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/iwlwifi/pcie/tx.c
drivers/net/wireless/mwifiex/cmdevt.c
drivers/net/wireless/mwifiex/init.c
drivers/net/wireless/mwifiex/main.h
drivers/net/wireless/mwifiex/pcie.c
drivers/net/wireless/mwifiex/sta_ioctl.c
drivers/net/wireless/rtlwifi/usb.c
net/bluetooth/sco.c
net/mac80211/iface.c
net/mac80211/mesh.c
net/mac80211/mlme.c
net/mac80211/rx.c
net/wireless/core.c
net/wireless/core.h
net/wireless/nl80211.c
net/wireless/sme.c
net/wireless/trace.h