Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Tue, 9 Dec 2014 03:37:35 +0000 (11:37 +0800)
committerZhang Rui <rui.zhang@intel.com>
Tue, 9 Dec 2014 03:37:35 +0000 (11:37 +0800)

Trivial merge