From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 15 Dec 2015 16:43:36 +0000 (+0100)
Subject: Merge tag 'sunxi-defconfig-for-4.5' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.5-rc1~41^2~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1741c73579d7639f27b0ee353771ea47830d926b;p=thirdparty%2Fkernel%2Flinux.git

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

Merge "Allwinner defconfig changes for 4.5" from Maxime Ripard:

A bunch of patches to enable new drivers related to Allwinner SoCs.

* tag 'sunxi-defconfig-for-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Clean up sunxi_defconfig
  ARM: sunxi: Really enable LRADC keys in sunxi_defconfig
  ARM: sunxi: Re-enable SID driver in sunxi_defconfig
  ARM: sunxi: Re-enable SID driver in multi_v7_defconfig
  ARM: multi_v7_defconfig: Enable RSB and AXP20X related drivers as modules
  ARM: sunxi_defconfig: Update MFD_AXP20X symbol and enable MFD_AXP20X_RSB
---

1741c73579d7639f27b0ee353771ea47830d926b