]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
projects / thirdparty / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c5bb4a 8a038b8)
Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 2 May 2017 16:48:26 +0000 (09:48 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 2 May 2017 16:48:26 +0000 (09:48 -0700)
Prepare input updates for 4.12 merge window.

1  2 
drivers/input/joystick/xpad.c patch | diff1 | diff2 | blob | history
include/uapi/linux/Kbuild patch | diff1 | diff2 | blob | history

diff --cc drivers/input/joystick/xpad.c
Simple merge
diff --cc include/uapi/linux/Kbuild
Simple merge
A mirror of Linus' kernel repository