diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-04-02 14:09:09 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-02 14:09:09 +0200 |
| commit | 1fd29be5cede285e673d3ed73d9ed9db59536b33 (patch) | |
| tree | 47d64b98c24c08ac49975a5a37ab821b7c4ad4e5 /include/sound/tea6330t.h | |
| parent | HID: wacom: ask for a in-prox report when it was missed (diff) | |
| parent | HID: add quirk for PIXART OEM mouse used by HP (diff) | |
| download | linux-1fd29be5cede285e673d3ed73d9ed9db59536b33.tar.xz linux-1fd29be5cede285e673d3ed73d9ed9db59536b33.zip | |
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>
Diffstat (limited to 'include/sound/tea6330t.h')
0 files changed, 0 insertions, 0 deletions