Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Dec 2013 20:30:27 +0000 (15:30 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Dec 2013 20:30:27 +0000 (15:30 -0500)
commit145babc68eebc4d72cd1a92d92e91739b905b7df
tree192088d4211b3f60c1aaa231029b519bf2fbc591
parente08fd975bf26aa8063cadd245817e042f570472d
parentcfb27d29b61cc32c0bb75f741aeabb9c6e6af742
Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath

Conflicts:
drivers/net/wireless/ath/ath10k/htc.c
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/ath10k/debug.h
drivers/net/wireless/ath/ath10k/htc.c
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/ath10k/pci.c
drivers/net/wireless/ath/ath10k/wmi.c