diff options
| author | Jiri Kosina <jkosina@suse.com> | 2015-07-17 11:19:37 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2015-07-17 11:19:37 +0200 |
| commit | 57f7e160a137f8ddae455f15abed9bdd1b90ab63 (patch) | |
| tree | 92993f2b4015a21bf645ba4d14e75dd73a624261 /drivers/hid/hid-zpff.c | |
| parent | HID: wacom: remove the extra Pen interface for Wacom Bamboo PAD (diff) | |
| parent | HID: input: call input_sync() when automatically releasing a key (diff) | |
| download | linux-57f7e160a137f8ddae455f15abed9bdd1b90ab63.tar.xz linux-57f7e160a137f8ddae455f15abed9bdd1b90ab63.zip | |
Merge branch 'for-4.3/upstream' into for-4.3/wacom
There is a conflict between 67e123f ("Delete unnecessary checks") sitting
in for-4.3/upstream and memory allocation failure handling from Jason Gerecke.
Pull this so that conflict could be resolved.
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Diffstat (limited to 'drivers/hid/hid-zpff.c')
0 files changed, 0 insertions, 0 deletions