Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Feb 2014 20:02:02 +0000 (15:02 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Feb 2014 20:02:02 +0000 (15:02 -0500)
commit88daf80dcca19ff995cc263592426f734a9702f3
tree7a52e25df74e52d00c3821032e719244e8a5526f
parent010d3c3989706d800ae72253773fa6537cc9f74c
parent35582ad9d342025653aaf28ed321bf5352488d7f
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
drivers/net/wireless/iwlwifi/iwl-drv.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
net/mac80211/iface.c
net/wireless/chan.c