]> 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 into uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 11 Dec 2015 20:21:30 +0000 (12:21 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 11 Dec 2015 20:21:30 +0000 (12:21 -0800)
* 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek:
  ib_core: Add udata argument to alloc_shpd()

1  2 
drivers/infiniband/core/uverbs_cmd.c

Simple merge