]> 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: 031cf19 68905eb)
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorDavid S. Miller <davem@davemloft.net>
Wed, 30 Jul 2008 22:44:30 +0000 (15:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Jul 2008 22:44:30 +0000 (15:44 -0700)

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