summaryrefslogtreecommitdiffstats
path: root/drivers/nvmem
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-25 16:29:44 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-25 16:29:44 +0200
commit194c8581eb9b6d42e9232c7693d86d2ee3799986 (patch)
tree86d926b7407c33379dd719fad2ccaf03d5c5228a /drivers/nvmem
parentmei: drop wr_msg from the mei_dev structure (diff)
parentLinux 4.7-rc4 (diff)
downloadlinux-194c8581eb9b6d42e9232c7693d86d2ee3799986.tar.xz
linux-194c8581eb9b6d42e9232c7693d86d2ee3799986.zip
Merge 4.7-rc4 into char-misc-next
We want those fixes in here to help with merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nvmem')
0 files changed, 0 insertions, 0 deletions