]> 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: 369cf77 22e091e)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 12 Nov 2010 19:04:26 +0000 (11:04 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Nov 2010 19:04:26 +0000 (11:04 -0800)

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