| commit | 0e396ee43e445cb7c215a98da4e76d0ce354d9d7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | Sat Jun 18 11:42:35 2005 -0700 |
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | Sat Jun 18 11:42:35 2005 -0700 |
| tree | a6fde6a33965abb6077420cda31e3f1fbe8d3891 | |
| parent | b8112df71cae7d6a86158caeb19d215f56c4f9ab [diff] | |
| parent | 2089a0d38bc9c2cdd084207ebf7082b18cf4bf58 [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.