diff options
| author |   Tejun Heo <tj@kernel.org> | 2012-09-17 16:07:34 -0700 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2012-09-17 16:09:09 -0700 |
| commit | 6c1423ba5dbdab45bcd8c1bc3bc6e07fe3f6a470 (patch) | |
| tree | 3c7899ba9eee94f408faf483622faa23cbdbfed2 /net/tipc | |
| parent | workqueue: deprecate __cancel_delayed_work() (diff) | |
| parent | workqueue: always clear WORKER_REBIND in busy_worker_rebind_fn() (diff) | |
| download | linux-dev-6c1423ba5dbdab45bcd8c1bc3bc6e07fe3f6a470.tar.xz linux-dev-6c1423ba5dbdab45bcd8c1bc3bc6e07fe3f6a470.zip | |
Merge branch 'for-3.6-fixes' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions