kernel_optimize_test/kernel/trace
Linus Torvalds 19035e5b5d Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  timers: Logic to move non pinned timers
  timers: /proc/sys sysctl hook to enable timer migration
  timers: Identifying the existing pinned timers
  timers: Framework for identifying pinned timers
  timers: allow deferrable timers for intervals tv2-tv5 to be deferred

Fix up conflicts in kernel/sched.c and kernel/timer.c manually
2009-06-15 10:06:19 -07:00
..
blktrace.c
ftrace.c
Kconfig
kmemtrace.c
Makefile
ring_buffer_benchmark.c
ring_buffer.c
trace_boot.c
trace_branch.c
trace_clock.c
trace_event_profile.c
trace_event_types.h
trace_events_filter.c
trace_events.c
trace_export.c
trace_functions_graph.c
trace_functions.c
trace_hw_branches.c
trace_irqsoff.c
trace_mmiotrace.c
trace_nop.c
trace_output.c
trace_output.h
trace_power.c
trace_printk.c
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
trace_sysprof.c
trace_workqueue.c
trace.c
trace.h