diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 19:11:30 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 19:11:30 -0700 |
| commit | 23dbd13d778d879f686e231c101478aa355b4ec5 (patch) | |
| tree | b9c8565c43bf104716a71f680bca08bb965d7d13 /arch/arm/mach-prima2 | |
| parent | 19cfdfd66841af00913d11f6076deee08fec6b75 (diff) | |
| parent | 44fc41f92694241917a1590eb03081a68a38f480 (diff) | |
Merge tag 'samsung-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc
Samsung mach/soc update for v4.13:
1. Fix possible circular Kconfig dependency on S3C64xx.
* tag 'samsung-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: s3c64xx: Do not select ARM_AMBA from S3C64XX_PL080
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-prima2')
0 files changed, 0 insertions, 0 deletions