From: Linus Torvalds Date: Fri, 18 Feb 2011 20:36:06 +0000 (-0800) Subject: Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq X-Git-Tag: v3.0~1796 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc3adfc6703edfd2484902b5391092c717076f87;p=platform%2Fkernel%2Flinux-amlogic.git Merge branch 'fixes-2.6.38' of git://git./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 --- bc3adfc6703edfd2484902b5391092c717076f87