]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Jun 2012 16:42:14 +0000 (12:42 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Jun 2012 16:42:14 +0000 (12:42 -0400)
commit55c8fba5fb8656642fda596752eeb41199fb7c8e
tree9059d0fe8f2a49425edab88ea8e7d5337e13e66c
parentedb697200d684603a68ff4c22edf5fbd88c48bad
parent8816972495094f9b2bb3361830821d8721c47068
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
13 files changed:
MAINTAINERS
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/scan.c
drivers/net/wireless/mwifiex/sta_cmd.c
drivers/net/wireless/mwifiex/sta_cmdresp.c
drivers/net/wireless/rtlwifi/cam.c
drivers/net/wireless/rtlwifi/pci.c
drivers/net/wireless/ti/wlcore/tx.c
net/wireless/nl80211.c