Quentin Perret 21bd85cd95 Merge remote-tracking branch 'android-4.9' into 'android-4.9-eas-dev' ...

Fixed merge conflicts caused by 8a174b4749 ("sched/fair: prevent
possible infinite loop in sched_group_energy)

Change-Id: Iba35631a213b88f6361838f28573af3407568919
Signed-off-by: Quentin Perret <quentin.perret@arm.com>

2018-02-22 18:04:18 +00:00

..

events

Merge remote-tracking branch 'android-4.9' into 'android-4.9-eas-dev'

2018-02-22 18:04:18 +00:00

define_trace.h

tracing: Introduce TRACE_EVENT_FN_COND macro

2015-12-23 14:27:21 -05:00

perf.h

tracing: Use outer () on __get_str() definition

2016-07-15 15:50:58 -04:00

syscall.h

tracing: Rename ftrace_event_{call,class} to trace_event_{call,class}

2015-05-13 14:06:10 -04:00

trace_events.h

tracing: Use outer () on __get_str() definition

2016-07-15 15:50:58 -04:00