summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2017-07-05 14:51:32 +0800
committerZhang Rui <rui.zhang@intel.com>2017-07-05 14:51:32 +0800
commit467aebee872af7f5e703809e19a66de633a1aa2c (patch)
tree21a80e16c5e7a3c1d34c60fb6f6274eb9e6c1347 /drivers/memstick
parentc0bc126f97fb929b3ae02c1c62322645d70eb408 (diff)
parent1fe3854a83b580727c9464b37b62ba77ead1d6f6 (diff)
downloadlinux-467aebee872af7f5e703809e19a66de633a1aa2c.tar.bz2
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/memstick')
0 files changed, 0 insertions, 0 deletions