Head SHA1: 4fc86cbb2d24860b019227ec1d5b38dd0ee7cedf


Steven Rostedt (2):
      fgraph: Remove calltime and rettime from generic operations
      tracing: gfp: Remove duplication of recording GFP flags

----
 include/linux/ftrace.h               |  2 --
 include/trace/events/mmflags.h       | 41 +++++++++---------------------------
 kernel/trace/fgraph.c                |  1 -
 kernel/trace/trace.h                 |  4 +++-
 kernel/trace/trace_entries.h         |  8 +++----
 kernel/trace/trace_functions_graph.c | 33 +++++++++++++++++------------
 kernel/trace/trace_irqsoff.c         |  5 +++--
 kernel/trace/trace_sched_wakeup.c    |  6 ++++--
 8 files changed, 43 insertions(+), 57 deletions(-)