From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 4 Sep 2013 08:49:39 +0000 (+0200)
Subject: Merge branch 'master' into for-3.12/upstream
X-Git-Tag: MMI-PSA29.97-13-9~13720^2~1^7~9
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b
diff --cc drivers/hid/hidraw.c
index 194a5660a389,6f1feb2c2e97..8918dd12bb69
--- a/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;