From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 12 Dec 2012 20:41:55 +0000 (+0100)
Subject: Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for... 
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~36^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=818b930bc15077fc00ff16bb22c5df1857f05afa;p=pandora-kernel.git

Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid', 'for-3.8/multitouch', 'for-3.8/roccat', 'for-3.8/sensors' and 'for-3.8/upstream' into for-linus

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

818b930bc15077fc00ff16bb22c5df1857f05afa
Reading git-diff-tree failed