From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 15 Aug 2017 16:07:52 +0000 (+0200)
Subject: Merge tag 'sunxi-defconfig-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~68^2^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=959e02aeb9bcb021a8cd16068af2fc9fe5ce00d7;p=linux.git

Merge tag 'sunxi-defconfig-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/defconfig

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

Sunxi_defconfig is refreshed and various power supply and ADC drivers
of the AXP PMICs have been enabled.

* tag 'sunxi-defconfig-for-4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm: sunxi: Add AXP20X_ADC
  arm: sunxi: Add additional power supplies
  arm: sunxi: refresh the defconfig
---

959e02aeb9bcb021a8cd16068af2fc9fe5ce00d7