Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 27 Oct 2014 18:09:36 +0000 (14:09 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 27 Oct 2014 18:09:36 +0000 (14:09 -0400)
commit490f0dc4d52a01904cead9dd2fa57956ca737eb7
tree1f33f2c0b0318fe8d7b1ed08832ae787ba9c6627
parent61ed53deb1c6a4386d8710dbbfcee8779c381931
parent84cbf3a7592879810f80cece6c7f736f099ab163
Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath

Conflicts:
drivers/net/wireless/ath/wil6210/wil6210.h
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/wil6210/wil6210.h