| commit | bc3adfc6703edfd2484902b5391092c717076f87 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 18 12:36:06 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Feb 18 12:36:06 2011 -0800 |
| tree | 9df3b216990f6b321095bcc6c35444f5e0d8165c | |
| parent | 3c18d4de86e4a7f93815c081e50e0543fa27200f [diff] | |
| parent | 3233cdbd9fa347a6d6897a94cc6ed0302ae83c4f [diff] |
Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq * 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: make sure MAYDAY_INITIAL_TIMEOUT is at least 2 jiffies long workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable' workqueue: wake up a worker when a rescuer is leaving a gcwq