1be67654 parent 0d9cabdccedb79ee5f27b77ff51f29a9e7d23275 parent e06ffa1ede4146cbc261d90f5dff3d63fe2e9d7a author Linus Torvalds 1332292402 -0700 committer Linus Torvalds 1332292402 -0700 Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq Pull workqueue changes from Tejun Heo: "This contains only one commit which cleans up UP allocation path a bit." * 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: use percpu allocator for cwq on UP ÛîÇKœ