Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Sep 2014 17:35:46 +0000 (13:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 Sep 2014 17:35:46 +0000 (13:35 -0400)
commit687b93082c0469fe9fe85583e6265a3d910cd89a
tree2069814b550be9e4cb194a658b2c3f91198efb3f
parentd3d3e0017fcc2c3c8e5f6a229f4b65f8bcc15bae
parentb25f32cb02155d68c690255ba846796a1c248fd3
Merge branch 'for-linville' of git://github.com/kvalo/ath
drivers/net/wireless/ath/ath10k/mac.c