From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 11 Sep 2015 21:32:37 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com... 
X-Git-Tag: v4.1.12-92~286
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=649adf6bdaab6f6d2767a684bcd94cde73640bd4;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* '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
---

649adf6bdaab6f6d2767a684bcd94cde73640bd4