| commit | 7bece8155be133cd67c41eed2b31c60a310609de | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri May 23 00:05:14 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri May 23 00:05:14 2008 -0700 |
| tree | 906a62dcf10c1f2e6c1188a2b6e386668fcd9fe3 | |
| parent | b9a2f2e450b0f770bb4347ae8d48eb2dea701e24 [diff] | |
| parent | bdefff1f54cb76a19700663f211350de2f65cc91 [diff] |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6