]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 11 Sep 2015 21:32:37 +0000 (14:32 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 11 Sep 2015 21:32:37 +0000 (14:32 -0700)
* 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek:
  NVMe: Setup max hardware sector count to 512KB
  intel_pstate: enable HWP per CPU

1  2 
drivers/cpufreq/intel_pstate.c

Simple merge