Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Oct 2010 20:07:43 +0000 (13:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Oct 2010 20:07:43 +0000 (13:07 -0700)
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rcu: rcu_read_lock_bh_held(): disabling irqs also disables bh
  generic-ipi: Fix deadlock in __smp_call_function_single


Trivial merge