git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f3f66b6
7a4a77b
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
author
John W. Linville
<linville@tuxdriver.com>
Tue, 5 Jan 2010 22:18:59 +0000
(17:18 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 5 Jan 2010 22:18:59 +0000
(17:18 -0500)
Conflicts:
net/mac80211/iface.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff