]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25f42b6 1668b19)
Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6...
authorJeff Garzik <jeff@garzik.org>
Tue, 20 Jun 2006 08:43:43 +0000 (04:43 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 20 Jun 2006 08:43:43 +0000 (04:43 -0400)

Trivial merge
Clone of davem's net-next-2.6 tree