diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 02:13:22 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 02:13:22 +0100 |
commit | e45836fafe157df137a837093037f741ad8f4c90 (patch) | |
tree | cba5fdef1fd2e70f3610c78dbcb56ebd1be67654 /drivers/net/ethernet/intel/e1000/e1000.h | |
parent | Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg... (diff) | |
parent | workqueue: use percpu allocator for cwq on UP (diff) | |
download | linux-e45836fafe157df137a837093037f741ad8f4c90.tar.xz linux-e45836fafe157df137a837093037f741ad8f4c90.zip |
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
Diffstat (limited to 'drivers/net/ethernet/intel/e1000/e1000.h')
0 files changed, 0 insertions, 0 deletions