]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Wed, 5 Jul 2017 06:51:32 +0000 (14:51 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 5 Jul 2017 06:51:32 +0000 (14:51 +0800)

Trivial merge