]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Dec 2013 20:30:27 +0000 (15:30 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Dec 2013 20:30:27 +0000 (15:30 -0500)
commitbeb9391428f6a2c0d3007a4eec34837a8b532c48
tree192088d4211b3f60c1aaa231029b519bf2fbc591
parent53d600ac3ce09f8a5c98329f28b681053b9a1099
parent663c5cae42906dd1710c392f95b343ae7bb4eff9
Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath

Conflicts:
drivers/net/wireless/ath/ath10k/htc.c
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/ath10k/debug.h
drivers/net/wireless/ath/ath10k/htc.c
drivers/net/wireless/ath/ath10k/mac.c
drivers/net/wireless/ath/ath10k/pci.c
drivers/net/wireless/ath/ath10k/wmi.c