diff options
author | Mark Brown <broonie@kernel.org> | 2019-09-20 11:47:20 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-09-20 11:47:20 +0100 |
commit | 5bc98b946fc7c4b7f5c80e859a3f92457e0f7fd3 (patch) | |
tree | 47294fcd44e15fdbb69a60bc51f780a55ae00242 /scripts/kconfig/confdata.c | |
parent | bd302977ecfe79e709503cdbbd1de778d2897eb5 (diff) | |
parent | 77564a4829ef6d309331d443ea6ceb065f3dc371 (diff) | |
download | linux-next-5bc98b946fc7c4b7f5c80e859a3f92457e0f7fd3.tar.gz |
Merge remote-tracking branch 'kbuild/for-next'
# Conflicts:
# drivers/gpu/drm/amd/display/dc/calcs/Makefile
# drivers/gpu/drm/amd/display/dc/dml/Makefile
# drivers/gpu/drm/amd/display/dc/dsc/Makefile
# scripts/link-vmlinux.sh
Diffstat (limited to 'scripts/kconfig/confdata.c')
0 files changed, 0 insertions, 0 deletions