]> 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: 9d1e5e4 147b2c8)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net...
authorDavid S. Miller <davem@davemloft.net>
Wed, 17 Nov 2010 17:56:04 +0000 (09:56 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Nov 2010 17:56:04 +0000 (09:56 -0800)

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