Kevin Hilman 4dddf72053 Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android ...

Conflicts:
	fs/exec.c

 Resolution summary:

    Conflict between upstream/LTS commit 9eae8ac6ab (fs: take
    i_mutex during prepare_binprm for set[ug]id executables) and
    android commit 9d0ff694bc (sched: move no_new_privs into new
    atomic flags).  Resolution: move task_no_new_privs() usage into
    new function created by upstream/LTS comit.

2015-08-14 09:55:00 -07:00

..

blktrace.c

blktrace: fix accounting of partially completed requests

2014-05-30 21:52:11 -07:00

ftrace.c

tracing: Fix graph tracer with stack tracer on other archs

2014-07-28 08:00:03 -07:00

gpu-traces.c

trace/events: add gpu trace events

2013-07-01 14:16:21 -07:00

Kconfig

trace/events: add gpu trace events

2013-07-01 14:16:21 -07:00

Makefile

trace/events: add gpu trace events

2013-07-01 14:16:21 -07:00

power-traces.c

…

ring_buffer_benchmark.c

ring-buffer-benchmark: Fix the wrong sched_priority of producer

2015-06-22 16:55:53 -07:00

ring_buffer.c

ring-buffer: Replace this_cpu_*() with __this_cpu_*()

2015-05-06 21:56:21 +02:00

rpm-traces.c

…

trace_branch.c

tracing: Have branch tracer use recursive field of task struct

2015-08-03 09:29:45 -07:00

trace_clock.c

tracing: Fix wraparound problems in "uptime" trace clock

2014-07-31 12:53:49 -07:00

trace_entries.h

tracing: Add trace_puts() for even faster trace_printk() tracing

2013-03-15 00:35:55 -04:00

trace_event_perf.c

perf/ftrace: Fix paranoid level for enabling function tracer

2013-11-29 11:11:43 -08:00

trace_events_filter_test.h

…

trace_events_filter.c

tracing/filter: Do not allow infix to exceed end of string

2015-08-03 09:29:45 -07:00

trace_events.c

move d_rcu from overlapping d_child to overlapping d_alias

2015-04-29 10:34:00 +02:00

trace_export.c

tracing: Fix array size mismatch in format string

2014-03-31 09:58:12 -07:00

trace_functions_graph.c

trace: add non-hierarchical function_graph option

2013-07-01 14:16:22 -07:00

trace_functions.c

tracing: Add function probe to trigger stack traces

2013-03-15 00:36:05 -04:00

trace_irqsoff.c

tracing: Use flag buffer_disabled for irqsoff tracer

2013-08-14 22:59:07 -07:00

trace_kdb.c

…

trace_kprobe.c

tracing/kprobes: Fail to unregister if probe event files are in use

2013-08-29 09:47:34 -07:00

trace_mmiotrace.c

…

trace_nop.c

…

trace_output.c

trace: add non-hierarchical function_graph option

2013-07-01 14:16:22 -07:00

trace_output.h

tracing: Rename trace_event_mutex to trace_event_sem

2013-03-15 13:22:10 -04:00

trace_printk.c

…

trace_probe.c

…

trace_probe.h

…

trace_sched_switch.c

…

trace_sched_wakeup.c

tracing: Add function-trace option to disable function tracing of latency tracers

2013-03-15 00:36:08 -04:00

trace_selftest_dynamic.c

…

trace_selftest.c

tracing: Fix bad parameter passed in branch selftest

2013-05-29 16:00:03 -04:00

trace_stack.c

Merge tag 'trace-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2013-04-29 13:55:38 -07:00

trace_stat.c

tracing: Check return value of tracing_init_dentry()

2013-04-12 23:02:32 -04:00

trace_stat.h

…

trace_syscalls.c

tracing/syscalls: Ignore numbers outside NR_syscalls' range

2014-11-14 08:47:53 -08:00

trace_uprobe.c

tracing/uprobes: Fail to unregister if probe event files are in use

2013-08-29 09:47:34 -07:00

trace.c

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

2015-05-12 15:18:24 +08:00

trace.h

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

2015-08-14 09:55:00 -07:00