From: Olof Johansson <olof@lixom.net>
Date: Thu, 6 Aug 2015 08:12:52 +0000 (+0200)
Subject: Merge tag 'sunxi-defconfig-for-4.3' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~1182^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d304f99c9cee11fc23ccd29e4506d646df58122f;p=firefly-linux-kernel-4.4.55.git

Merge tag 'sunxi-defconfig-for-4.3' of https://git./linux/kernel/git/mripard/linux into next/defconfig

Allwinner defconfig changes for 4.3

Two patches that enable various Allwinner related drivers drivers both in
sunxi_defconfig and in multi_v7_defconfig

* tag 'sunxi-defconfig-for-4.3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: multi_v7_defconfig: Enable Allwinner P2WI, PWM, DMA_SUN6I, cryptodev
  ARM: sunxi_defconfig: Enable DMA_SUN6I, P2WI, PWM, cryptodev, EXTCON, FHANDLE

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

d304f99c9cee11fc23ccd29e4506d646df58122f