Merge branch 'ib/4.17-xen-kbdfront-runtime-config' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 12 Jun 2018 23:38:35 +0000 (16:38 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 12 Jun 2018 23:38:35 +0000 (16:38 -0700)
Bring in xen-kbdfront changes.

1  2 
MAINTAINERS
drivers/input/mouse/synaptics.c

diff --cc MAINTAINERS
Simple merge
Simple merge