commit | 199410469e4a4714cfd223820c6028e9eca83e84 | [log] [tgz] |
---|---|---|
author | Kalle Valo <kvalo@qca.qualcomm.com> | Thu Dec 01 13:36:32 2016 +0200 |
committer | Kalle Valo <kvalo@qca.qualcomm.com> | Thu Dec 01 13:36:32 2016 +0200 |
tree | 295fe304e9b6593d35eece9120c25c26c91a1199 | |
parent | 2138dda848d2a84c701aa5722ceaae7f5ae5e4fc [diff] | |
parent | 384abd33d5d571361a0d8eb67e130aeccf2cb3db [diff] |
Merge branch 'ath-next' Conflicts: drivers/net/wireless/ath/ath10k/mac.c