Zhang Bo c96ae9f146 Merge branch 'android-4.9' into imx_4.9.y ...

Conflicts:
	drivers/cpufreq/cpufreq_interactive.c
	drivers/mmc/card/Kconfig
	drivers/mmc/card/queue.c
	drivers/mmc/card/queue.h
	drivers/mmc/core/Kconfig
	drivers/mmc/core/block.c
	drivers/mmc/core/core.c
	drivers/mmc/core/host.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sdio.c
	drivers/staging/android/Kconfig
	drivers/usb/chipidea/otg.c
	include/linux/mmc/core.h
	include/linux/mmc/host.h
	include/linux/mmc/mmc.h
	kernel/sched/cpufreq_schedutil.c

Change-Id: I4dbf6f884a251dffa61ef7271f5c37293b764c94

2017-12-11 20:20:40 +08:00

..

blktrace.c

block: better op and flags encoding

2017-10-05 14:58:58 +03:00

bpf_trace.c

bpf: fix bpf_trace_printk on 32 bit archs

2017-08-30 10:21:39 +02:00

ftrace.c

ftrace: Fix kmemleak in unregister_ftrace_graph

2017-10-12 11:51:24 +02:00

gpu-traces.c

…

Kconfig

FROMLIST: tracing: Add support for preempt and irq enable/disable events

2017-10-06 16:20:25 -07:00

Makefile

FROMLIST: tracing: Add support for preempt and irq enable/disable events

2017-10-06 16:20:25 -07:00

power-traces.c

…

ring_buffer_benchmark.c

…

ring_buffer.c

…

rpm-traces.c

…

trace_benchmark.c

…

trace_benchmark.h

…

trace_branch.c

…

trace_clock.c

…

trace_entries.h

…

trace_event_perf.c

…

trace_events_filter_test.h

…

trace_events_filter.c

tracing: Fix freeing of filter in create_filter() when set_str is false

2017-08-30 10:21:49 +02:00

trace_events_hist.c

…

trace_events_trigger.c

…

trace_events.c

…

trace_export.c

…

trace_functions_graph.c

…

trace_functions.c

…

trace_hwlat.c

…

trace_irqsoff.c

FROMLIST: tracing: Add support for preempt and irq enable/disable events

2017-10-06 16:20:25 -07:00

trace_kdb.c

…

trace_kprobe.c

…

trace_mmiotrace.c

…

trace_nop.c

…

trace_output.c

…

trace_output.h

…

trace_printk.c

…

trace_probe.c

…

trace_probe.h

…

trace_sched_switch.c

…

trace_sched_wakeup.c

…

trace_selftest_dynamic.c

…

trace_selftest.c

ftrace: Fix selftest goto location on error

2017-09-27 14:39:23 +02:00

trace_seq.c

…

trace_stack.c

…

trace_stat.c

…

trace_stat.h

…

trace_syscalls.c

…

trace_uprobe.c

…

trace.c

Merge 4.9.53 into android-4.9

2017-10-05 10:37:37 +02:00

trace.h

…

tracing_map.c

tracing: Fix kmemleak in tracing_map_array_free()

2017-08-30 10:21:49 +02:00

tracing_map.h

…