Merge branch 'master' into for-3.12/upstream
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Sep 2013 08:49:39 +0000 (10:49 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Sep 2013 08:49:57 +0000 (10:49 +0200)
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>
1  2 
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-logitech-dj.c
drivers/hid/hidraw.c
net/bluetooth/hidp/core.c

Simple merge
Simple merge
Simple merge
@@@ -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;
Simple merge