git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b8112df
2089a0d
)
Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev...
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 18:42:35 +0000
(11:42 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 18:42:35 +0000
(11:42 -0700)
This is a fixed-up version of the broken "upstream-2.6.13" branch, where
I re-did the manual merge of drivers/net/r8169.c by hand, and made sure
the history is all good.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff