]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e56236b 648d493 7ad8148)
Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 31 Jan 2018 15:23:58 +0000 (16:23 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 31 Jan 2018 15:23:58 +0000 (16:23 +0100)
Pull assorted small fixes queued for merge window.

1  2  3 
drivers/hid/hid-sony.c patch | diff1 | diff2 | diff3 | blob | history
net/bluetooth/hidp/core.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/hid/hid-sony.c
Simple merge
diff --cc net/bluetooth/hidp/core.c
Simple merge
XArray, radix tree and IDR