summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-axff.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.com>2015-07-17 09:19:37 (GMT)
committerJiri Kosina <jkosina@suse.com>2015-07-17 09:19:37 (GMT)
commit57f7e160a137f8ddae455f15abed9bdd1b90ab63 (patch)
tree92993f2b4015a21bf645ba4d14e75dd73a624261 /drivers/hid/hid-axff.c
parent70caee0a3721956a98cb4bfbfa0eaa38c9182e44 (diff)
parent3eb4351af42bd8b6de20daab07b204a85c35248f (diff)
downloadlinux-57f7e160a137f8ddae455f15abed9bdd1b90ab63.tar.xz
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-axff.c')
0 files changed, 0 insertions, 0 deletions