]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Sat, 19 Sep 2009 09:27:32 +0000 (11:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 19 Sep 2009 09:28:41 +0000 (11:28 +0200)
commit55e29aa8f6570ad069bcfdfa9ca9f1ac41b45fc8
tree739063990a8077b29ef97e69d73bce94573daae4
parentca6f30be7f53f398a1be3e2b47337a44f2fdda76
parent4c8c035d50895de236adc6db9aaff9ee2aa85717
Merge branch 'linus' into perfcounters/core

Merge reason: Bring in tracing changes we depend on.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/perf_counter.c
kernel/perf_counter.c
kernel/sched_fair.c