projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6d2d32 f22e6e8)
Merge tag 'v4.0-rc7' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 7 Apr 2015 15:46:23 +0000 (08:46 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 7 Apr 2015 15:46:23 +0000 (08:46 -0700)
Sync up with Linux 4.0-rc7 to bring in ALPS changes.

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/input/mouse/synaptics.c patch | diff1 | diff2 | blob | history
include/uapi/linux/input.h patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/input/mouse/synaptics.c
Simple merge
diff --cc include/uapi/linux/input.h
Simple merge