Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 02:30:17 +0000 (19:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 02:30:17 +0000 (19:30 -0700)
commite5149cc44cf9c5e23fbe34515fc6b4b91c0e48c4
treef6c3c7401f827d91d77702cb2177d3c4fa0e625d
parent45d7f32c7a43cbb9592886d38190e379e2eb2226
parent9a919c46dfa48a9c1f465174609b90253eb8ffc1
Merge branch 'for-linus' of git://git./linux/kernel/git/tj/wq

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  drm: fix fallouts from slow-work -> wq conversion
  workqueue: workqueue_cpu_callback() should be cpu_notifier instead of hotcpu_notifier
  workqueue: add missing __percpu markup in kernel/workqueue.c