Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Wed, 27 Aug 2014 07:40:27 +0000 (15:40 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 27 Aug 2014 07:40:27 +0000 (15:40 +0800)

Trivial merge