| commit | 145babc68eebc4d72cd1a92d92e91739b905b7df | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Dec 09 15:30:27 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Dec 09 15:30:27 2013 -0500 |
| tree | 192088d4211b3f60c1aaa231029b519bf2fbc591 | |
| parent | e08fd975bf26aa8063cadd245817e042f570472d [diff] | |
| parent | cfb27d29b61cc32c0bb75f741aeabb9c6e6af742 [diff] |
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