git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e08fd97 cfb27d2)
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)
Conflicts:
drivers/net/wireless/ath/ath10k/htc.c
drivers/net/wireless/ath/ath10k/mac.c


Trivial merge
Pandora Kernel Repository