]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 12a81c8 eb703f9)
Merge branch 'perf/nmi' into perf/core
authorIngo Molnar <mingo@elte.hu>
Thu, 5 Aug 2010 06:45:05 +0000 (08:45 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 5 Aug 2010 06:45:05 +0000 (08:45 +0200)
commit61be7fdec2f51b99570cd5dcc30c7848c8e56513
tree4a73ee635bc3e35dc54f75caddd26ffb6238bb5ctree | snapshot
parent12a81c8df13c60904febcafcf6b90ca1acb67122commit | diff
parenteb703f98191a505f78d0066712ad67d5dedc4c90commit | diff
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 <mingo@elte.hu>
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
arch/Kconfig diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/kernel/traps.c diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
kernel/Makefile diff1 | diff2 | blob | history
kernel/sysctl.c diff1 | diff2 | blob | history
kernel/timer.c diff1 | diff2 | blob | history
lib/Kconfig.debug diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.