git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
61ed53d
84cbf3a
)
Merge tag 'for-linville-20141024' of git://github.com/kvalo/ath
author
John W. Linville
<linville@tuxdriver.com>
Mon, 27 Oct 2014 18:09:36 +0000
(14:09 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Mon, 27 Oct 2014 18:09:36 +0000
(14:09 -0400)
Conflicts:
drivers/net/wireless/ath/wil6210/wil6210.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff