Merge branch 'wq/for-3.14-fixes' into wq/for-3.15

To receive 70044d71 ("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>