Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jun 2008 19:37:13 +0000 (12:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jun 2008 19:37:13 +0000 (12:37 -0700)
commit1f1e2ce8a55bac60ff165d353c6b882e750c9092
treeb11aaa5baa04ea5ea0ecc549fa1c95430919cd82
parente570dc2a503f8334b700e8483082c675394f53fd
parent9c106c119ebedf624fbd682fd2a4d52e3c8c1a67
Merge branch 'core-fixes-for-linus' of git://git./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:
  softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression
  rcupreempt: remove export of rcu_batches_completed_bh
  cpuset: limit the input of cpuset.sched_relax_domain_level
kernel/cpuset.c
kernel/sched.c