From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Thu, 29 Jun 2017 14:23:21 +0000 (-0400)
Subject: Merge branch 'ca-git/topic/uek-4.1/dtrace' into ca-git/uek/uek-4.1-next
X-Git-Tag: v4.1.12-105.0.20170705_2000~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b82001d8ed656cc033044ccec32627f3fc712a2b;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'ca-git/topic/uek-4.1/dtrace' into ca-git/uek/uek-4.1-next
---

b82001d8ed656cc033044ccec32627f3fc712a2b