Merge branch 'for-3.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

Merge branch 'for-3.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git

This merge is necessary because hotplug fixes from for-3.6-fixes
warrants further cleanups on top.  The merge generates a trivial
conflict in gcwq_associate() between the following two commits.

 96e65306b8 "workqueue: UNBOUND -> REBIND morphing in rebind_workers() should be atomic"
 e2b6a6d570 "workqueue: use system_highpri_wq for highpri workers in rebind_workers()"

Both add local variables to the same block.  Any order works.

Signed-off-by: Tejun Heo <tj@kernel.org>