From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Tue, 18 Aug 2015 04:44:41 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/dtrace' of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-92~300
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e1821d5b8de20e690f43914bd87cfcb52ad2398d;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/dtrace' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/dtrace' of git://ca-git.us.oracle.com/linux-uek:
  dtrace: only call dtrace functions when CONFIG_DTRACE is set
---

e1821d5b8de20e690f43914bd87cfcb52ad2398d