Merge branch 'for-linville' of git://github.com/kvalo/ath

Kalle Valo <[email protected]> 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 <[email protected]>

diff --cc drivers/net/wireless/ath/ath10k/core.h
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge