From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 19 Oct 2017 20:53:28 +0000 (+0200)
Subject: Merge tag 'qcom-defconfig-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.15-rc1~76^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e130634e8a20f32b0744b8eccd47398fbdb9145;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'qcom-defconfig-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc

Pull "Qualcomm ARM Based defconfig Updates for v4.15" from Andy Gross:

* Enable Sony Z2 tablet options
* Enable USB on APQ8064/MSM8974
* Fixup/catchup config to support newer options

* tag 'qcom-defconfig-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: qcom_defconfig: Enable Z2 Tablet related options
  ARM: qcom_defconfig: Disable DEBUG_GPIO
  ARM: qcom_defconfig: Enable configs for USB on apq8064/msm8974
  ARM: qcom_defconfig: Resync with new Kconfig options
---

0e130634e8a20f32b0744b8eccd47398fbdb9145