]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 20:36:06 +0000 (12:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Feb 2011 20:36:06 +0000 (12:36 -0800)
* '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


Trivial merge