From: Tejun Heo <tj@kernel.org>
Date: Mon, 17 Sep 2012 23:07:34 +0000 (-0700)
Subject: Merge branch 'for-3.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~52^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c1423ba5dbdab45bcd8c1bc3bc6e07fe3f6a470;p=pandora-kernel.git

Merge branch 'for-3.6-fixes' of git://git./linux/kernel/git/tj/wq into for-3.7

This merge is necessary as Lai's CPU hotplug restructuring series
depends on the CPU hotplug bug fixes in for-3.6-fixes.

The merge creates one trivial conflict 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 variable definitions to the same block and can be
merged in any order.

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

6c1423ba5dbdab45bcd8c1bc3bc6e07fe3f6a470
Reading git-diff-tree failed