]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b8112df 2089a0d)
Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 18:42:35 +0000 (11:42 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 18 Jun 2005 18:42:35 +0000 (11:42 -0700)
commit0e396ee43e445cb7c215a98da4e76d0ce354d9d7
treea6fde6a33965abb6077420cda31e3f1fbe8d3891tree | snapshot
parentb8112df71cae7d6a86158caeb19d215f56c4f9abcommit | diff
parent2089a0d38bc9c2cdd084207ebf7082b18cf4bf58commit | diff
Manual merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git

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.
drivers/net/r8169.c diff1 | diff2 | blob | history
Linux 2.6 source tree