tree 19a7f36292adbc178ba4fac6f2f9e1acadb1b3f1
parent 39c12be86aaedd2f81bfb2236aca5333a2334dea
parent b3a084b9b684622b149e8dcf03855bf0d5fb588b
author Linus Torvalds <torvalds@linux-foundation.org> 1286309263 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1286309263 -0700

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* '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