Ingo Molnar 32673822e4 Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core ... Conflicts: include/linux/perf_event.h Merge reason: pick up the latest jump-label enhancements, they are cooked ready. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2011-04-27 10:40:21 +02:00
..
boot	sparc32: added U-Boot build target: uImage	2011-03-16 18:19:04 -07:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
include/asm	Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core	2011-04-27 10:40:21 +02:00
kernel	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
lib	Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 18:28:30 -07:00
math-emu	Fix common misspellings	2011-03-31 11:26:23 -03:00
mm	lib, arch: add filter argument to show_mem and fix private implementations	2011-03-24 17:49:37 -07:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	sparc32: remove tick14.c	2011-03-16 18:19:08 -07:00
Kconfig	genirq: Remove the now obsolete config options and select statements	2011-03-30 14:13:23 +02:00
Kconfig.debug	sparc: Kill user copy check code.	2010-08-09 00:45:46 -07:00
Makefile	sparc32: added U-Boot build target: uImage	2011-03-16 18:19:04 -07:00