Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:50:20 +0000 (13:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:50:23 +0000 (13:50 +1100)
commite14477cb27beecfe79382961ab84327e1c2bc760
tree1792b9737eab4c78b0da80bf4953d129059e5c16
parentb10a2154e649be0a9ff5e5c20e446c25ac6a9174
parent43ed384339ae67a74a8ba4851268b23216ef7a44
Merge remote-tracking branch 'ftrace/for-next'
kernel/trace/blktrace.c
kernel/trace/ftrace.c
kernel/trace/trace_events.c
kernel/trace/trace_sched_wakeup.c
kernel/trace/trace_stack.c