]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Dec 2009 17:35:44 +0000 (09:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Dec 2009 17:35:44 +0000 (09:35 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: Add debugobjects support

1  2 
arch/x86/kernel/smpboot.c
kernel/workqueue.c
lib/Kconfig.debug

Simple merge
Simple merge
Simple merge