Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 17 Nov 2014 20:28:39 +0000 (15:28 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 17 Nov 2014 20:28:39 +0000 (15:28 -0500)
commit9b5186b4be26d1fb8d63a3001b2e6ff0b2e2f82f
tree6dcb087aaf91e1e2d3489934d777e67e5ac34047
parenta15c706889753a92ccf90a55516a4f0c87a02201
parent9de8f26f0038133bdfb8cf847936645dab949d88
Merge branch 'for-linville' of git://github.com/kvalo/ath

Kalle Valo <kvalo@qca.qualcomm.com> says:

"One ath6kl patch and rest for ath10k, but nothing really major which
stands out. Most notable:

o fix resume (Bartosz)

o firmware restart is now faster and more reliable (Michal)

o it's now possible to test hardware restart functionality without
  crashing the firmware using hw-restart parameter with
  simulate_fw_crash debugfs file (Michal)"

Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath10k/core.h
drivers/net/wireless/ath/ath10k/mac.c