Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Tue, 3 Nov 2015 07:24:40 +0000 (15:24 +0800)
committerZhang Rui <rui.zhang@intel.com>
Tue, 3 Nov 2015 07:24:40 +0000 (15:24 +0800)
1  2 
drivers/base/power/opp.c

Simple merge