Ingo Molnar 6c869e772c Merge branch 'perf/urgent' into perf/core ... Conflicts: arch/x86/kernel/apic/hw_nmi.c Merge reason: Resolve conflict, queue up dependent patch. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-11-26 15:07:02 +01:00
..
alpha	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
arm	Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6	2010-11-15 14:06:11 -08:00
avr32	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
blackfin	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
cris	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
frv	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
h8300	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
ia64	SCSI host lock push-down	2010-11-16 13:33:23 -08:00
m32r	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
m68k	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
m68knommu	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
microblaze	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
mips	Merge git://git.infradead.org/mtd-2.6	2010-10-30 08:31:35 -07:00
mn10300	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
parisc	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
powerpc	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb	2010-11-18 08:24:58 -08:00
s390	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
score	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
sh	Merge branches 'sh/pio-death', 'sh/nommu', 'sh/clkfwk', 'sh/core' and 'sh/intc-extension' into sh-fixes-for-linus	2010-11-08 09:42:43 +09:00
sparc	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
tile	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
um	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
x86	Merge branch 'perf/urgent' into perf/core	2010-11-26 15:07:02 +01:00
xtensa	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-10-28 16:16:39 -07:00
.gitignore
Kconfig	jump label: Add work around to i386 gcc asm goto bug	2010-10-29 14:45:29 -04:00