Merge tag 'v4.14-rc6' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 23 Oct 2017 18:43:40 +0000 (11:43 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 23 Oct 2017 18:43:40 +0000 (11:43 -0700)
Merge with mainline to bring in the timer API changes.

1  2 
drivers/input/touchscreen/stmfts.c

Simple merge