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
Kconfig
Makefile
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
trace_event_perf.c
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_functions.c
trace_irqsoff.c
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
trace_stack.c
trace_stat.c
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
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