Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Sat, 13 Jan 2018 06:47:13 +0000 (14:47 +0800)
committerZhang Rui <rui.zhang@intel.com>
Sat, 13 Jan 2018 06:47:13 +0000 (14:47 +0800)

Trivial merge