]> 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>
Fri, 28 Oct 2016 21:36:16 +0000 (14:36 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Fri, 28 Oct 2016 21:36:16 +0000 (14:36 -0700)

Trivial merge