]> www.infradead.org Git - nvme.git/commitdiff
projects / nvme.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fd7081 5ed02db)
Merge tag 'v4.12-rc3' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 30 May 2017 02:54:21 +0000 (19:54 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 30 May 2017 02:54:21 +0000 (19:54 -0700)
Sync with mainline to bring in changes in platform drovers dropping
calls to sparse_keymap_free() so that we can remove it for good.

1  2 
drivers/input/mouse/elan_i2c_i2c.c patch | diff1 | diff2 | blob | history
drivers/input/mouse/elantech.c patch | diff1 | diff2 | blob | history

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