]> 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: 77501f3 452503f)
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 22 Oct 2005 01:33:27 +0000 (21:33 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 22 Oct 2005 01:33:27 +0000 (21:33 -0400)

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