Merge tag 'sunxi-config64-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Mon, 21 Aug 2017 07:21:26 +0000 (09:21 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 21 Aug 2017 07:21:26 +0000 (09:21 +0200)
commitddd0eb3d29e00c899e4a349246ad074e9335693b
tree998bed6a397f76ef9dfecc6764f94a9633814947
parentf4da0ed9d623255af846b35d601d0207ebe9d3a3
parent908d10b02b80a81c5dd1cee88165db2a30e23d45
Merge tag 'sunxi-config64-for-4.14' of https://git./linux/kernel/git/sunxi/linux into next/arm64

Pull "Allwinner arm64 defconfig changes for 4.14" from Chen-Yu Tsai:

Enable X-Powers AXP series PMIC mfd and regulator support by default.

* tag 'sunxi-config64-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: defconfig: Enable REGULATOR_AXP20X
  arm64: defconfig: Enable MFD_AXP20X_RSB
arch/arm64/configs/defconfig