]> 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...
authorChuck Anderson <chuck.anderson@oracle.com>
Sun, 22 May 2016 23:15:54 +0000 (16:15 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 22 May 2016 23:15:54 +0000 (16:15 -0700)
1  2 
drivers/infiniband/core/uverbs_main.c

Simple merge