Merge tag 'sunxi-core-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 12:34:06 +0000 (05:34 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 19 Apr 2017 12:34:06 +0000 (05:34 -0700)
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>
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge