projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 37746c9 4923ee4)
Merge branch 'samsung/exynos-multiplatform' into next/drivers
authorOlof Johansson <olof@lixom.net>
Fri, 26 Apr 2013 18:47:45 +0000 (11:47 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 26 Apr 2013 18:47:45 +0000 (11:47 -0700)
commit340fcb5cb4c91e58a5102beb0b86b9c416b8c956
treed0e41752e473069f4ec9a065cd1f060c4e91266btree | snapshot
parent37746c9a2dd28d52790dd84267b848c087a63b2ecommit | diff
parent4923ee444a39c8b75027ed01a7812e940194dbeccommit | diff
Merge branch 'samsung/exynos-multiplatform' into next/drivers

This merges in the revert of multiplatform support for exynos.

Trivial conflicts on removed code. Also, needed to add "select COMMON_CLK"
to the non-multiplatform EXYNOS config option.

* samsung/exynos-multiplatform:
  Revert "ARM: exynos: enable multiplatform support"

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-exynos/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-exynos/Makefile diff1 | diff2 | blob | history
arch/arm/mach-exynos/common.c diff1 | diff2 | blob | history
arch/arm/plat-samsung/Kconfig diff1 | diff2 | blob | history
arch/arm/plat-samsung/Makefile diff1 | diff2 | blob | history
drivers/gpio/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.