diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 21:50:53 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 21:50:53 +0200 |
commit | 033c596022acf1dddf3b56299f65c89824392e6b (patch) | |
tree | 568e8131877b428c62b9cce44e8a45293478faef /tools/perf/scripts/python/export-to-sqlite.py | |
parent | aae4e7a8bc44722fe70d58920a36916b1043195e (diff) | |
parent | f991ce429a420dbb42b3e4b5a47490c84390d7e1 (diff) |
Merge tag 'samsung-soc-4.14' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions