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>
This commit is contained in:
Jiri Kosina 2015-04-02 14:09:09 +02:00
commit 1fd29be5ce
11 changed files with 97 additions and 43 deletions