]> 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>
Tue, 18 Aug 2015 04:44:41 +0000 (21:44 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Tue, 18 Aug 2015 04:44:41 +0000 (21:44 -0700)
* 'topic/uek-4.1/dtrace' of git://ca-git.us.oracle.com/linux-uek:
  dtrace: only call dtrace functions when CONFIG_DTRACE is set

1  2 
kernel/module.c

diff --cc kernel/module.c
Simple merge