]> 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: 28c8e47 aea9d71)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Jun 2010 18:58:02 +0000 (11:58 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Jun 2010 18:58:02 +0000 (11:58 -0700)

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