git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19cfdfd 44fc41f)
Merge tag 'samsung-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk...
authorOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 02:11:30 +0000 (19:11 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 02:11:30 +0000 (19:11 -0700)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.