diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-26 20:47:45 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-26 20:47:45 +0200 |
| commit | 340fcb5cb4c91e58a5102beb0b86b9c416b8c956 (patch) | |
| tree | d0e41752e473069f4ec9a065cd1f060c4e91266b /net | |
| parent | clk: exynos5250: Fix parent clock for sclk_mmc{0,1,2,3} (diff) | |
| parent | Revert "ARM: exynos: enable multiplatform support" (diff) | |
| download | linux-340fcb5cb4c91e58a5102beb0b86b9c416b8c956.tar.xz linux-340fcb5cb4c91e58a5102beb0b86b9c416b8c956.zip | |
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>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions