git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ba9b28d
cb15f81
)
Merge branch 'upstream-fixes' into upstream
author
Jeff Garzik
<jeff@garzik.org>
Thu, 8 Jun 2006 19:55:45 +0000
(15:55 -0400)
committer
Jeff Garzik
<jeff@garzik.org>
Thu, 8 Jun 2006 19:55:45 +0000
(15:55 -0400)
Conflicts:
drivers/net/e1000/e1000_ethtool.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff