Merge branch 'wq/for-3.14-fixes' into wq/for-3.15
authorTejun Heo <tj@kernel.org>
Fri, 7 Mar 2014 15:20:20 +0000 (10:20 -0500)
committerTejun Heo <tj@kernel.org>
Fri, 7 Mar 2014 15:20:20 +0000 (10:20 -0500)
commit7104ce9b349e0b0c9a71ee25efeb007057029677
tree9b08a41c9c696c5a6bd80bf72a8b8bbb16ad8e15
parent90d88bd75424dff51e2072fd2f8fa85ee893aa17
parent70044d71d31d6973665ced5be04ef39ac1c09a48
Merge branch 'wq/for-3.14-fixes' into wq/for-3.15

To receive 70044d71d31d ("firewire: don't use PREPARE_DELAYED_WORK").
There will be further related updates in for-3.15 branch.

Signed-off-by: Tejun Heo <tj@kernel.org>
include/linux/workqueue.h