Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Jan 2013 19:43:00 +0000 (14:43 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Jan 2013 19:43:00 +0000 (14:43 -0500)
commit4205e6ef4ee747aa81930537b6035086ba5f1e28
treeb2ebe2b4621f5f531f283cb9bf0005cd3c04ca7b
parentcef401de7be8c4e155c6746bfccf721a4fa5fab9
parent9ebea3829fac7505e0cd2642fbd13cfa9c038831
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
drivers/bcma/bcma_private.h
drivers/bcma/driver_pci_host.c
drivers/bcma/main.c
drivers/net/wireless/ath/ath9k/htc_drv_init.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/nfc/pn544/i2c.c
include/linux/bcma/bcma_driver_pci.h
include/net/cfg80211.h
net/wireless/core.c
net/wireless/reg.c