| commit | 323dbaba2cfab170c656f5d68986ff0ced5b421c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Feb 24 17:57:16 2008 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Sun Feb 24 17:57:16 2008 -0800 |
| tree | 99d2ef0d64df0036a4a9d2ef054b5bf20dd7fbd5 | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 [diff] | |
| parent | 3bf319a787a881aa6ad8213b98b93b8de2b6f0e0 [diff] |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6