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>

diff --cc drivers/hv/hv_balloon.c
Simple merge

diff --cc drivers/misc/atmel-ssc.c
Simple merge

diff --cc drivers/misc/mei/init.c
index 557eed2a159520fb31dbde10c36a74d9c7a07bc7,e6f16f83ecdee479bfd679f169e078866bd3354a..92c73118b13c450149e21ec48b990e6329f4e5b1
--- 1/drivers/misc/mei/init.c
--- 2/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);