summaryrefslogtreecommitdiffstats
path: root/drivers/nvmem
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2020-05-17 21:10:28 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2020-05-17 21:10:28 -0700
commit2969869bfac3cb8c549f6cadea6b97bb1d9ec86f (patch)
tree50a585182a13e7ebe587ea1cf34f06272c218b02 /drivers/nvmem
parent04e49867fad1f4a0739862bb15133f96ace1d190 (diff)
parentd34fced41e172fae2df7819b1d5a398c62067599 (diff)
downloadlinux-2969869bfac3cb8c549f6cadea6b97bb1d9ec86f.tar.bz2
Merge branch 'for-linus' into next
Merge for-linus branch to sync Elan touchscreen driver code.
Diffstat (limited to 'drivers/nvmem')
0 files changed, 0 insertions, 0 deletions