From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 6 Sep 2013 09:59:53 +0000 (+0200)
Subject: Merge branch 'for-3.12/sensor-hub' into for-linus
X-Git-Tag: v3.12-rc1~125^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e5a494e4b4ba7e6aa1a8a285e98e3665fcb396e;p=pandora-kernel.git

Merge branch 'for-3.12/sensor-hub' into for-linus

Conflicts:
	drivers/hid/hid-sensor-hub.c
---

4e5a494e4b4ba7e6aa1a8a285e98e3665fcb396e
Reading git-diff-tree failed