From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 21 Feb 2013 09:42:39 +0000 (+0100)
Subject: Merge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor', 'for-3.9/hidraw' and... 
X-Git-Tag: v3.9-rc1~112^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=539cf54bdd922474d22585837c9fec3343d7061b;p=pandora-kernel.git

Merge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor', 'for-3.9/hidraw' and 'for-3.9/i2c-hid' into for-linus

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

539cf54bdd922474d22585837c9fec3343d7061b
Reading git-diff-tree failed