projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd4cae8 bfe01a5)
Merge tag 'v3.17' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 11 Oct 2014 18:34:07 +0000 (11:34 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 11 Oct 2014 18:34:07 +0000 (11:34 -0700)
Synchronize with mainline to bring in changes to Synaptics and i8042
drivers.

1  2 
drivers/input/mouse/psmouse-base.c patch | diff1 | diff2 | blob | history
drivers/input/mouse/synaptics.c patch | diff1 | diff2 | blob | history

diff --cc drivers/input/mouse/psmouse-base.c
Simple merge
diff --cc drivers/input/mouse/synaptics.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.