| commit | 14eabf70c82cade5dbc71d2e913d533193a91785 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Mar 25 23:11:25 2008 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Tue Mar 25 23:11:25 2008 -0700 |
| tree | 53bdf1534f73c59fe8ae796f660cab541a20224c | |
| parent | f49e1aa133c2c9b74b5dfddca8863609bbda9086 [diff] | |
| parent | 2f4489112896770d66dc2960f71174d69ee23004 [diff] |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6