]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9ffecb1 25556ae)
Merge branch 'wr-cleanup' of git://git.infradead.org/users/hch/rdma into wr-cleanup
authorDoug Ledford <dledford@redhat.com>
Thu, 29 Oct 2015 02:21:09 +0000 (22:21 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 29 Oct 2015 02:21:09 +0000 (22:21 -0400)
commiteb14ab3ba14081e403be93dc6396627567fadf60
treeb243b4687b65c036f29c2835384ff1312c9e6c18tree | snapshot
parent9ffecb10283508260936b96022d4ee43a7798b4ccommit | diff
parent25556ae6b965321c7e7469faa06ddbeae50dac91commit | diff
Merge branch 'wr-cleanup' of git://git.infradead.org/users/hch/rdma into wr-cleanup

Signed-off-by: Doug Ledford <dledford@redhat.com>
Conflicts:
drivers/infiniband/ulp/isert/ib_isert.c - Commit 4366b19ca5eb
(iser-target: Change the recv buffers posting logic) changed the
logic in isert_put_datain() and had to be hand merged
drivers/infiniband/ulp/isert/ib_isert.c diff1 | diff2 | blob | history
drivers/infiniband/ulp/isert/ib_isert.h diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules