]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed.rds-p2' into topic/uek-4.1/ofed
authorMukesh Kacker <mukesh.kacker@oracle.com>
Tue, 13 Oct 2015 15:44:42 +0000 (08:44 -0700)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Tue, 13 Oct 2015 15:44:42 +0000 (08:44 -0700)
* topic/uek-4.1/ofed.rds-p2:
  RDS/IB: print string constants in more places
  ib/rds: runtime debuggability enhancement

1  2 
net/rds/af_rds.c
net/rds/ib.c

Simple merge
diff --cc net/rds/ib.c
Simple merge