]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/chander-public.git...
authorChuck Anderson <chuck.anderson@oracle.com>
Fri, 5 Feb 2016 05:43:23 +0000 (21:43 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Fri, 5 Feb 2016 05:43:23 +0000 (21:43 -0800)

Trivial merge