summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-10-19 22:53:28 +0200
committerArnd Bergmann <arnd@arndb.de>2017-10-19 22:53:28 +0200
commit0e130634e8a20f32b0744b8eccd47398fbdb9145 (patch)
treec3dcbf94b6cb41545060b3e09556fb08a4169105 /security
parentf4b5c3bdc387fb16f0f3320cb436e7c2bf0143e1 (diff)
parent1dfd49957321ce11813af64f10ae70c44c345ea2 (diff)
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
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions