]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
projects / ~emulex / infiniband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6aba74f a84b50c)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 31 Mar 2011 04:37:29 +0000 (21:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 31 Mar 2011 04:37:29 +0000 (21:37 -0700)

Trivial merge
Emulex OneConnect RDMA Driver