From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 13 Apr 2015 21:43:34 +0000 (+0200)
Subject: Merge branch 'for-4.1/sensor-hub' into for-linus
X-Git-Tag: omap-for-v4.1/fixes-rc1~163^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e455c27bddbf8cf6d1039daea40de8e6865c453;p=pandora-kernel.git

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

Conflicts:
	drivers/iio/common/hid-sensors/hid-sensor-trigger.c
	include/linux/hid-sensor-hub.h
---

2e455c27bddbf8cf6d1039daea40de8e6865c453
Reading git-diff-tree failed