Merge branch 'for-3.12/upstream' into for-next

diff --cc drivers/hid/hidraw.c
index dbfe300746c65e35bf1ea38c454ba0695f7e0a4e,194a5660a389b7339d7707aff0d3fd8f7d66e92c..8918dd12bb6915d08ab588e04b22b64a24d6e827
--- 1/drivers/hid/hidraw.c
--- 2/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@@ -517,7 -526,9 +526,8 @@@ int hidraw_connect(struct hid_device *h
                goto out;
        }
  
 -      mutex_unlock(&minors_lock);
        init_waitqueue_head(&dev->wait);
+       spin_lock_init(&dev->list_lock);
        INIT_LIST_HEAD(&dev->list);
  
        dev->hid = hid;