Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Tue, 21 Feb 2017 07:50:23 +0000 (15:50 +0800)
committerZhang Rui <rui.zhang@intel.com>
Tue, 21 Feb 2017 07:50:23 +0000 (15:50 +0800)

Trivial merge