From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 22 Jun 2015 14:22:06 +0000 (+0200)
Subject: Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech... 
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~157^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=817a3125819983956bb8a22455a569aac4e8ea34;p=pandora-kernel.git

Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech' into for-linus

Conflicts:
	drivers/hid/hid-logitech-hidpp.c
---

817a3125819983956bb8a22455a569aac4e8ea34
Reading git-diff-tree failed