]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8531c5f 0572e3d)
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
tree1dbf80c83d9521dcdebc9e670f48da6c1ba34187tree | snapshot
parent8531c5ffbca65f6df868637c26e6df6f88bff738commit | diff
parent0572e3da3ff5c3744b2f606ecf296d5f89a4bbdfcommit | diff
Merge upstream into 'upstream' branch of netdev-2.6.git.

Hand fix merge conflict in drivers/net/tokenring/Kconfig.
drivers/net/Kconfig diff1 | diff2 | blob | history
drivers/net/tokenring/Kconfig diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.