Merge tag 'samsung-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

1. Enable USB3503 on multi_v7 for Odroid U3.
2. Enable USB Attached SCSI for Odroid HC1.

* tag 'samsung-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: multi_v7_defconfig: Enable UAS support for Odroid HC1 board
  ARM: exynos_defconfig: Enable UAS support for Odroid HC1 board
  ARM: multi_v7_defconfig: Enable USB3503 driver

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge