Linus Torvalds f02a38d86a Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: jump label: Add work around to i386 gcc asm goto bug x86, ftrace: Use safe noops, drop trap test jump_label: Fix unaligned traps on sparc. jump label: Make arch_jump_label_text_poke_early() optional jump label: Fix error with preempt disable holding mutex oprofile: Remove deprecated use of flush_scheduled_work() oprofile: Fix the hang while taking the cpu offline jump label: Fix deadlock b/w jump_label_mutex vs. text_mutex jump label: Fix module __init section race * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Check irq_remapped instead of remapping_enabled in destroy_irq()		2010-10-30 11:43:26 -07:00
..
boot	Merge branch 'master' into for-next	2010-06-16 18:08:13 +02:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
include/asm	Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-10-30 11:43:26 -07:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2010-10-29 08:03:48 -07:00
lib	sparc64: Make lock backoff really a NOP on UP builds.	2010-08-18 22:53:26 -07:00
math-emu	Revert "endian: #define __BYTE_ORDER"	2010-05-26 08:30:15 -07:00
mm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2010-10-29 08:03:48 -07:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-10-25 08:19:14 -07:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2010-10-29 08:03:48 -07:00
Kconfig.debug	sparc: Kill user copy check code.	2010-08-09 00:45:46 -07:00
Makefile	sparc: Set UTS_MACHINE correctly.	2009-12-05 17:17:55 -08:00