git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0efdf26
720eeb4
)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
author
Jeff Garzik
<jeff@garzik.org>
Thu, 7 Dec 2006 10:02:40 +0000
(
05:02
-0500)
committer
Jeff Garzik
<jeff@garzik.org>
Thu, 7 Dec 2006 10:02:40 +0000
(
05:02
-0500)
Conflicts:
drivers/net/wireless/zd1211rw/zd_mac.h
net/ieee80211/softmac/ieee80211softmac_assoc.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff