]> 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)
commita6e1d1f021d36bebe24ad2e561bcea572d24c7fd
tree1f33f2c0b0318fe8d7b1ed08832ae787ba9c6627
parent9867600b664a0cf0283eb93138bb4ecafca1d7e7
parent4f890109c10ef5c92e94f048b52cb3be2b6c3de4
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