]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d20abe6 06b0fe6)
Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Wed, 26 Aug 2015 19:38:58 +0000 (12:38 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Wed, 26 Aug 2015 19:38:58 +0000 (12:38 -0700)
* 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed:
  rds: print vendor error on error induced disconnect/re-connect
  rds: re-entry of rds_ib_xmit/rds_iw_xmit
  net/mlx4_vnic: Initialize new fields of mlx4_ib_qp


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.