]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'ca-git/topic/uek-4.1/dtrace' into ca-git/uek/uek-4.1-next
authorKris Van Hees <kris.van.hees@oracle.com>
Thu, 29 Jun 2017 14:23:21 +0000 (10:23 -0400)
committerKris Van Hees <kris.van.hees@oracle.com>
Thu, 29 Jun 2017 14:23:21 +0000 (10:23 -0400)

Trivial merge