Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Jul 2012 17:44:50 +0000 (13:44 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Jul 2012 17:44:50 +0000 (13:44 -0400)
commit38a00840638b4932152bca48098dbfa069d942a2
treedd12897854f6df8aac237d5fd46551c74be8153a
parent391e5c22f5f4e55817f8ba18a08ea717ed2d4a1f
parent2f8684ce7a47c91da7e0ccba2686277c103d02b6
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
14 files changed:
MAINTAINERS
drivers/net/wimax/i2400m/fw.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/carl9170/rx.c
drivers/net/wireless/brcm80211/brcmsmac/dma.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/sta_cmd.c
drivers/net/wireless/mwifiex/sta_cmdresp.c
net/mac80211/mesh_plink.c
net/nfc/netlink.c
net/wireless/nl80211.c