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)
commit91de76e661a266731fc2889a398ad1694df9d523
treeecc278f000f18e5b2b880f61ee4b0e68ebd1d6d4
parentaed5d0ee77c007dcdcaf48ea75be008f05a241be
parentbb176f67090ca54869fc1262c913aa69d2ede070
Merge tag 'v4.14-rc6' into next

Merge with mainline to bring in the timer API changes.
drivers/input/touchscreen/stmfts.c