| commit | 1fd29be5cede285e673d3ed73d9ed9db59536b33 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Thu Apr 02 14:09:09 2015 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Thu Apr 02 14:09:09 2015 +0200 |
| tree | 47d64b98c24c08ac49975a5a37ab821b7c4ad4e5 | |
| parent | 5fcad167315f224eaf6750b0fb85ee6c92f087cd [diff] | |
| parent | b70b82580248b5393241c986082842ec05a2b7d7 [diff] |
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>