]> err.no Git - linux-2.6/commit
Merge upstream into 'upstream' branch of netdev-2.6.git.
authorJeff Garzik <jgarzik@pobox.com>
Wed, 24 Aug 2005 05:03:34 +0000 (01:03 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 24 Aug 2005 05:03:34 +0000 (01:03 -0400)
commit75a95178dafb5c8d69b4abe45ea746a9cea23142
tree1dbf80c83d9521dcdebc9e670f48da6c1ba34187
parent8531c5ffbca65f6df868637c26e6df6f88bff738
parent0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf
Merge upstream into 'upstream' branch of netdev-2.6.git.

Hand fix merge conflict in drivers/net/tokenring/Kconfig.
drivers/net/Kconfig
drivers/net/tokenring/Kconfig