| commit | a5b17df04c4ad8f25fc598fce37fccb4b387c94c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu May 29 03:31:03 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu May 29 03:31:03 2008 -0700 |
| tree | 2d0084f6db86362eb067b617ff8470f255ba37e7 | |
| parent | b79eeeb9e48457579cb742cd02e162fcd673c4a3 [diff] | |
| parent | c03571a3e22b821e5be7bda7b166c4554770f489 [diff] |
Merge branch 'upstream-next-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6