]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 23 Nov 2009 17:52:51 +0000 (09:52 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Nov 2009 17:52:51 +0000 (09:52 -0800)

Trivial merge