git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 12a81c8 eb703f9)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 5 Aug 2010 06:45:05 +0000 (08:45 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 5 Aug 2010 06:45:05 +0000 (08:45 +0200)
commit	61be7fdec2f51b99570cd5dcc30c7848c8e56513
tree	4a73ee635bc3e35dc54f75caddd26ffb6238bb5c	tree
parent	12a81c8df13c60904febcafcf6b90ca1acb67122	commit \| diff
parent	eb703f98191a505f78d0066712ad67d5dedc4c90	commit \| 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.