]> 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>
Thu, 10 Mar 2016 21:05:48 +0000 (13:05 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 10 Mar 2016 21:05:48 +0000 (13:05 -0800)

Trivial merge