]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eddc39d 8ba78aa)
Merge branch 'topic/uek-4.1/dtrace' of git://ca-git.us.oracle.com/linux-uek into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 14 Aug 2015 15:18:28 +0000 (08:18 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 14 Aug 2015 15:18:28 +0000 (08:18 -0700)
* '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

1  2 
init/Kconfig patch | diff1 | diff2 | blob | history
kernel/module.c patch | diff1 | diff2 | blob | history

diff --cc init/Kconfig
Simple merge
diff --cc kernel/module.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.