Merge branch 'for-linville-ath10k' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Jun 2013 17:34:29 +0000 (13:34 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 13 Jun 2013 17:54:21 +0000 (13:54 -0400)
commitb70727e8a61a8e6b4d818519b03fce2937d0ef40
treeeb4cdab8e5d75e382fd156943a11a440b89f7079
parent3100cdd8bf813bcf66aa60afcaede7d92e11fab3
parent5e3dd157d7e70f0e3cea3f2573ed69fb156a19d5
Merge branch 'for-linville-ath10k' of git://github.com/kvalo/ath6kl
drivers/net/wireless/ath/ath10k/mac.c