Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 24 Apr 2013 14:54:20 +0000 (10:54 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 24 Apr 2013 14:54:20 +0000 (10:54 -0400)
commit6ed0e321a0aef14a894e26658108bf7e895c36a6
treef49428d68ebcb1beb757296ea1559079210babbe
parent3dec2246c2ff11beb24ca1950f074b2bcbc85953
parentb006ed545cbadf1ebd4683719554742d20dbcede
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
drivers/net/wireless/ath/wil6210/txrx.c
drivers/net/wireless/iwlegacy/4965-mac.c
drivers/net/wireless/iwlegacy/common.c
drivers/net/wireless/iwlwifi/pcie/tx.c
net/bluetooth/sco.c
net/mac80211/tx.c
net/nfc/llcp/sock.c
net/wireless/util.c