]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6d7024d0b29b9a8f1eba50e4e43a207321c3ec7c
tree1f33f2c0b0318fe8d7b1ed08832ae787ba9c6627
parentf366e68cbd156287cbd292cf95528be4d7c847cf
parent7705aa41015c0708c883e838a2dc7abc2ffe9f57
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