Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Feb 2013 18:16:17 +0000 (13:16 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Feb 2013 18:16:17 +0000 (13:16 -0500)
commitf5237f278f30a92401539a54f87ee0c717b6f818
tree209d4fd6fb00e660c76ca8ac5d4caed59dbb9957
parentb285109dde7b873b5dc671ef1b3ae3090f4bc72f
parentb26f5f09ebdeb85ab152344cc1d6d484a3ce967d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
16 files changed:
drivers/bcma/bcma_private.h
drivers/bcma/driver_chipcommon_nflash.c
drivers/bcma/main.c
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/iwlwifi/iwl-fw.h
drivers/net/wireless/mwifiex/11n.c
drivers/net/wireless/mwifiex/init.c
drivers/net/wireless/mwifiex/sdio.c
drivers/net/wireless/rtlwifi/usb.c
drivers/net/wireless/ti/wlcore/sdio.c
drivers/net/wireless/ti/wlcore/spi.c
drivers/net/wireless/ti/wlcore/wlcore_i.h
drivers/ssb/main.c
include/linux/bcma/bcma_driver_chipcommon.h
include/net/cfg80211.h
net/wireless/core.c