git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3ed6f69
5f68a2b
)
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...
author
John W. Linville
<linville@tuxdriver.com>
Tue, 11 Oct 2011 19:35:42 +0000
(15:35 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 11 Oct 2011 19:35:42 +0000
(15:35 -0400)
Conflicts:
Documentation/feature-removal-schedule.txt
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff