]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/dtrace' of git://ca-git.us.oracle.com/linux-uek into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 11 Sep 2015 21:32:59 +0000 (14:32 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 11 Sep 2015 21:32:59 +0000 (14:32 -0700)
* 'topic/uek-4.1/dtrace' of git://ca-git.us.oracle.com/linux-uek:
  kallsyms: unbreak kallmodsyms after CONFIG_KALLMODSYMS addition
  kallsyms: de-ifdef kallmodsyms
  dtrace: use syscall_get_nr() to obtain syscall number


Trivial merge