From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 2 Apr 2015 12:09:09 +0000 (+0200)
Subject: Merge branch 'for-4.0/upstream-fixes' into for-4.1/wacom
X-Git-Tag: omap-for-v4.2/o2_dc~153^2~1^11~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fd29be5cede285e673d3ed73d9ed9db59536b33;p=pandora-kernel.git

Merge branch 'for-4.0/upstream-fixes' into for-4.1/wacom

Conflicts:
	drivers/hid/wacom_wac.c

Need to fetch the 4.0 fixes to apply 4.1 patches based on top
of those.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

1fd29be5cede285e673d3ed73d9ed9db59536b33
Reading git-diff-tree failed