From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 29 Jul 2013 18:50:17 +0000 (-0700)
Subject: Merge 3.11-rc3 into char-misc-next.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9c5891bd4342349a200676d33f742dd1b864822c;p=linux-beck.git

Merge 3.11-rc3 into char-misc-next.

This resolves a merge issue with:
	drivers/misc/mei/init.c

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

9c5891bd4342349a200676d33f742dd1b864822c
diff --cc drivers/misc/mei/init.c
index 557eed2a1595,e6f16f83ecde..92c73118b13c
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@@ -154,15 -154,8 +154,14 @@@ void mei_reset(struct mei_device *dev, 
  		    dev->dev_state != MEI_DEV_POWER_DOWN)
  			dev->dev_state = MEI_DEV_RESETTING;
  
- 
 +		/* remove all waiting requests */
 +		mei_cl_all_write_clear(dev);
 +
  		mei_cl_all_disconnect(dev);
  
 +		/* wake up all readings so they can be interrupted */
 +		mei_cl_all_wakeup(dev);
 +
  		/* remove entry if already in list */
  		dev_dbg(&dev->pdev->dev, "remove iamthif and wd from the file list.\n");
  		mei_cl_unlink(&dev->wd_cl);