Merge branch 'master' into for-3.12/upstream

Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air")

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-logitech-dj.c
Simple merge

diff --cc drivers/hid/hidraw.c
index 194a566,6f1feb2..8918dd1
--- 1/drivers/hid/hidraw.c
--- 2/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@@ -526,9 -518,7 +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;

diff --cc net/bluetooth/hidp/core.c
Simple merge