Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Mon, 3 Aug 2015 15:11:25 +0000 (23:11 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 3 Aug 2015 15:11:25 +0000 (23:11 +0800)

Trivial merge