From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 1 Sep 2015 13:38:33 +0000 (+0200)
Subject: Merge branch 'for-4.3/microsoft' into for-linus
X-Git-Tag: omap-for-v4.3/fixes-rc1~125^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f212bd95a9f62b7929c59b16e1d3bbde2fb4081d;p=pandora-kernel.git

Merge branch 'for-4.3/microsoft' into for-linus

Conflicts:
	drivers/hid/usbhid/hid-quirks.c
---

f212bd95a9f62b7929c59b16e1d3bbde2fb4081d
Reading git-diff-tree failed