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

* topic/uek-4.1/dtrace:
  dtrace: eliminate need for arg counting in sdt macros
  dtrace: augment SDT probes with type information
  dtrace: import the sdt type information into per-sdt_probedesc state
  dtrace: record SDT and perf probe types in a new ELF section

diff --cc include/linux/tracepoint.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/signal.c
Simple merge