]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Dec 2009 18:12:00 +0000 (10:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Dec 2009 18:12:00 +0000 (10:12 -0800)
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Fix hotplug hang
  sched: Restore printk sanity


Trivial merge