git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ed0e03 bc465aa)
Merge tag 'v4.0-rc5' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 23 Mar 2015 16:18:27 +0000 (09:18 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 23 Mar 2015 16:18:27 +0000 (09:18 -0700)
Merge with the latest upstream to synchronize Synaptics changes
and bring in new infrastructure pieces.

Conflicts:
drivers/input/mouse/synaptics.c


Trivial merge
Pandora Kernel Repository