git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e1781ed
55afc80
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
author
John W. Linville
<linville@tuxdriver.com>
Wed, 30 Dec 2009 20:25:08 +0000
(15:25 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 30 Dec 2009 20:25:08 +0000
(15:25 -0500)
Conflicts:
drivers/net/wireless/libertas/scan.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff