Victor Wan 810c6dd972 Merge branch 'android-4.9' into amlogic-4.9-dev ...

Signed-off-by: Victor Wan <victor.wan@amlogic.com>

Conflicts:
	arch/arm/configs/bcm2835_defconfig
	arch/arm/configs/sunxi_defconfig
	include/linux/cpufreq.h
	init/main.c

2018-04-24 17:43:19 +08:00

..

events

Merge branch 'android-4.9' into amlogic-4.9-dev

2018-04-24 17:43:19 +08: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