From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 16 Aug 2017 19:50:53 +0000 (+0200)
Subject: Merge tag 'samsung-soc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=033c596022acf1dddf3b56299f65c89824392e6b;p=linux.git

Merge tag 'samsung-soc-4.14' of git://git./linux/kernel/git/krzk/linux into next/soc

Pull "Samsung mach/soc changes for v4.14" from Krzysztof Kozłowski:

Only for S3C24xx platform:
1. Cleanup from non-existent CONFIG entries.
2. Fix unmet NET dependency when H1940 bluetooth chip is selected..

* tag 'samsung-soc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: s3c24xx: make H1940BT depend on RFKILL
  ARM: s3c24xx: Do not confuse local define with Kconfig
  ARM: s3c24xx: Remove non-existing SND_SOC_SMDK2443_WM9710
  ARM: s3c24xx: Remove non-existing CONFIG_CPU_S3C2413
---

033c596022acf1dddf3b56299f65c89824392e6b