From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 14 Aug 2015 15:18:28 +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~303
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=56b69510151112b94552bf4b3ac3762860130542;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: ensure SDT module probes work with NORX
  dtrace: prevent the stack protector from breaking syscall tracing.
  kallsyms: make it possible to disable /proc/kallmodsyms
---

56b69510151112b94552bf4b3ac3762860130542