]> Git Repo - linux.git/commit
Merge branch 'perf/nmi' into perf/core
authorIngo Molnar <[email protected]>
Thu, 5 Aug 2010 06:45:05 +0000 (08:45 +0200)
committerIngo Molnar <[email protected]>
Thu, 5 Aug 2010 06:45:05 +0000 (08:45 +0200)
commit61be7fdec2f51b99570cd5dcc30c7848c8e56513
tree4a73ee635bc3e35dc54f75caddd26ffb6238bb5c
parent12a81c8df13c60904febcafcf6b90ca1acb67122
parenteb703f98191a505f78d0066712ad67d5dedc4c90
Merge branch 'perf/nmi' into perf/core

Conflicts:
kernel/Makefile

Merge reason: Add the now complete topic, fix the conflict.

Signed-off-by: Ingo Molnar <[email protected]>
Documentation/kernel-parameters.txt
arch/Kconfig
arch/x86/Kconfig
arch/x86/kernel/traps.c
include/linux/sched.h
kernel/Makefile
kernel/sysctl.c
kernel/timer.c
lib/Kconfig.debug
This page took 0.053539 seconds and 4 git commands to generate.