Merge branch 'for-linville' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 28 Aug 2014 18:36:38 +0000 (14:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 28 Aug 2014 18:36:38 +0000 (14:36 -0400)
commit59e25676cf78c2ff41228820c1c2382387850154
tree2db5bd1c4f954987be1df400451755aff20e0d7c
parent7bb75da1717296f5850e1a9a36896a52fd07a26a
parent0fdc14e42b40ecd7115cc670981d39a89eeee6c3
Merge branch 'for-linville' of git://github.com/kvalo/ath
drivers/net/wireless/ath/ath10k/pci.c
drivers/net/wireless/ath/ath6kl/init.c