]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Tue, 13 Oct 2015 17:10:40 +0000 (10:10 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Tue, 13 Oct 2015 17:10:40 +0000 (10:10 -0700)
* 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed:
  RDS/IB: print string constants in more places
  ib/rds: runtime debuggability enhancement

1  2 
net/rds/connection.c
net/rds/send.c

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