]> 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: 5c601d0 86bc843)
Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Jun 2006 19:38:11 +0000 (15:38 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 Jun 2006 19:38:11 +0000 (15:38 -0400)

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