From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 15 Aug 2017 15:51:51 +0000 (+0200)
Subject: Merge tag 'samsung-defconfig-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.14-rc1~68^2^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4156effc624b1454e9d2075bf3a096707035ddec;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'samsung-defconfig-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Pull "Samsung defconfig changes for v4.14" from Krzysztof Kozłowski:

1. Enable some drivers useful on our boards (communication: Bluetooth,
   WiFi, NFC, USB; codepages and crypto algorithms).
2. Enable debugging and lock testing options. These might have impact on
   performance but we use the exynos_defconfig a lot during development
   so they should bring benefits of detecting early locking issues.

* tag 'samsung-defconfig-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos_defconfig: Enable locking test options
  ARM: exynos_defconfig: Enable NLS_UTF8 and some crypto algorithms
  ARM: exynos_defconfig: Enable Bluetooth, mac80211, NFC and more USB drivers
---

4156effc624b1454e9d2075bf3a096707035ddec