Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index eed254da63a8..641c1a566687 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -730,7 +730,7 @@ static void mei_cl_wake_all(struct mei_cl *cl)
         /* synchronized under device mutex */
         if (waitqueue_active(&cl->wait)) {
                 cl_dbg(dev, cl, "Waking up ctrl write clients!\n");
-                wake_up_interruptible(&cl->wait);
+                wake_up(&cl->wait);
         }
 }