]> www.infradead.org Git - nvme.git/commitdiff
projects / nvme.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aed5d0e bb176f6)
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 patch | diff1 | diff2 | blob | history

diff --cc drivers/input/touchscreen/stmfts.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.