| commit | 75a95178dafb5c8d69b4abe45ea746a9cea23142 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jgarzik@pobox.com> | Wed Aug 24 01:03:34 2005 -0400 |
| committer | Jeff Garzik <jgarzik@pobox.com> | Wed Aug 24 01:03:34 2005 -0400 |
| tree | 1dbf80c83d9521dcdebc9e670f48da6c1ba34187 | |
| parent | 8531c5ffbca65f6df868637c26e6df6f88bff738 [diff] | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf [diff] |
Merge upstream into 'upstream' branch of netdev-2.6.git. Hand fix merge conflict in drivers/net/tokenring/Kconfig.