From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 31 Jan 2013 15:55:12 +0000 (+0100)
Subject: Merge branch 'for-3.9/steelseries' into for-next
X-Git-Tag: next-20130218~83^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3a0c429cebb8a70426eb0dea3fa169cd616d2eed;p=karo-tx-linux.git

Merge branch 'for-3.9/steelseries' into for-next

Conflicts:
	drivers/hid/hid-core.c
---

3a0c429cebb8a70426eb0dea3fa169cd616d2eed