Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Fri, 6 Nov 2015 01:30:53 +0000 (09:30 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 6 Nov 2015 01:30:53 +0000 (09:30 +0800)

Trivial merge