]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e570dc2 9c106c1)
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)
* '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

1  2 
kernel/cpuset.c patch | diff1 | diff2 | blob | history
kernel/sched.c patch | diff1 | diff2 | blob | history

diff --cc kernel/cpuset.c
Simple merge
diff --cc kernel/sched.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.