]> git.baikalelectronics.ru Git - kernel.git/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)
commitf0d4bfb3ce0eb444de469421b564674c9f48401b
tree1dbf80c83d9521dcdebc9e670f48da6c1ba34187
parent7f59be9f9e1452b3e035703cb85aea5cfaf52418
parent6345b324367bde61ca400f0dad362cad6cd55671
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