Merge tag 'samsung-soc-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk...
authorArnd Bergmann <arnd@arndb.de>
Wed, 11 Sep 2019 21:08:16 +0000 (23:08 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 11 Sep 2019 21:08:17 +0000 (23:08 +0200)
commiteef119dd47dc35d01dbe3712131f8d288d838d70
tree9794db236d0de12a7ce9232377740cc145454811
parent548d52bcc0702fa19d23118038111888def36393
parent13aeb3fe4d5bd78a6dc7bde32986a7296da420d3
Merge tag 'samsung-soc-5.4-3' of git://git./linux/kernel/git/krzk/linux into arm/late

Samsung mach/soc changes for v5.4, part 2

1. Fix system restart on S3C6410 due to missing match of watchdog,
2. Enable suppor for ARM architected timers on Exynos.

* tag 'samsung-soc-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos: Enable support for ARM architected timers
  ARM: samsung: Fix system restart on S3C6410
  MAINTAINERS: Extend patterns for Samsung SoC, Security Subsystem and clock drivers
  ARM: s3c64xx: squash samsung_usb_phy.h into setup-usb-phy.c
  ARM: exynos: Enable exynos-chipid driver
  ARM: samsung: Include GPIO driver header

Link: https://lore.kernel.org/r/20190911183632.4317-2-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
MAINTAINERS