From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 22 Jun 2015 14:23:43 +0000 (+0200)
Subject: Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4... 
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~157^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec3b34e1975670e68be3abff76f56dbb41dd417c;p=pandora-kernel.git

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

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

ec3b34e1975670e68be3abff76f56dbb41dd417c
Reading git-diff-tree failed