Merge tag 'sunxi-core-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git...

Allwinner core changes for 4.12

A change to our MAINTAINERS entry to reflect the new git tree, and a select
in our KConfig option to enable the device frequency scaling.

* tag 'sunxi-core-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  MAINTAINERS: Update the Allwinner sunXi entry
  ARM: sunxi: Select PM_OPP

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined MAINTAINERS
index c776906f67a9f6795a0aef555a7fe348d07c506f,bcef8d04f78a35a29c7af8d05a4cac172391c2f3..8cd40d7063b267741c6b112e37777e69fcfe784d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1047,8 -1047,13 +1047,13 @@@ M:    Chen-Yu Tsai <wens@csie.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  N:    sun[x456789]i
- F:    arch/arm/boot/dts/ntc-gr8*
+ N:    sun50i
+ F:    arch/arm/mach-sunxi/
  F:    arch/arm64/boot/dts/allwinner/
+ F:    drivers/clk/sunxi-ng/
+ F:    drivers/pinctrl/sunxi/
+ F:    drivers/soc/sunxi/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
  
  ARM/Allwinner SoC Clock Support
  M:    Emilio López <emilio@elopez.com.ar>
@@@ -8307,6 -8312,7 +8312,6 @@@ M:      Richard Leitner <richard.leitner@ski
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    drivers/usb/misc/usb251xb.c
 -F:    include/linux/platform_data/usb251xb.h
  F:    Documentation/devicetree/bindings/usb/usb251xb.txt
  
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER