| commit | 340fcb5cb4c91e58a5102beb0b86b9c416b8c956 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Fri Apr 26 11:47:45 2013 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Fri Apr 26 11:47:45 2013 -0700 |
| tree | d0e41752e473069f4ec9a065cd1f060c4e91266b | |
| parent | 37746c9a2dd28d52790dd84267b848c087a63b2e [diff] | |
| parent | 4923ee444a39c8b75027ed01a7812e940194dbec [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>