]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
projects / ~emulex / infiniband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a998d43 bf03085)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 3 Apr 2012 22:41:12 +0000 (18:41 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Apr 2012 22:41:12 +0000 (18:41 -0400)

Trivial merge
Emulex OneConnect RDMA Driver