]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Oct 2010 18:43:26 +0000 (11:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Oct 2010 18:43:26 +0000 (11:43 -0700)
commitf02a38d86a14b6e544e218d806ffb0442785f62b
tree84aace4aaf4b018c48f25ec2831888354baae16c
parent925d169f5b86fe57e2f5264ea574cce9a89b719d
parent169ed55bd30305b933f52bfab32a58671d44ab68
parent7b79462a20826a7269322113c68ca78d5f67c0bd
Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git./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()
arch/sparc/include/asm/jump_label.h
arch/x86/kernel/alternative.c