]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch topic/uek-4.1/dtrace of git://ca-git.us.oracle.com/linux-uek into uek...
authorChuck Anderson <chuck.anderson@oracle.com>
Sat, 28 May 2016 12:33:13 +0000 (05:33 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sat, 28 May 2016 12:33:13 +0000 (05:33 -0700)

Trivial merge