Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Wed, 14 Jan 2015 07:49:19 +0000 (15:49 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 14 Jan 2015 07:49:19 +0000 (15:49 +0800)

Trivial merge