| commit | 2e5a3eaca386ce026f240c7b21e5c4958fcea946 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Apr 17 14:13:13 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Apr 17 14:13:13 2008 -0700 |
| tree | 191cf2b340d008b711137ce8c40b27a3dadff8d5 | |
| parent | 8c95b4773dd8d0415269ffad7301ef96d75be8ee [diff] | |
| parent | 36b30ea940bb88d88c90698e0e3d97a805ab5856 [diff] |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6