diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-26 18:35:59 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-26 18:35:59 (GMT) |
| commit | 772ba2ffd2033ecc4451c10b20c01814156ee1b1 (patch) | |
| tree | c3d7b3f1441bd900e3c8e22e1c37eed954c2fd41 /drivers/pcmcia/m32r_pcc.c | |
| parent | f19814721e24cac152348872ff38f38a3b45852a (diff) | |
| parent | 4923ee444a39c8b75027ed01a7812e940194dbec (diff) | |
| download | linux-772ba2ffd2033ecc4451c10b20c01814156ee1b1.tar.xz | |
Merge branch 'samsung/exynos-multiplatform' into next/multiplatform
This just merges in the revert of multiplatform support. Not doing it by
cherry-pick since we need the same revert in the next/drivers branch.
* samsung/exynos-multiplatform:
Revert "ARM: exynos: enable multiplatform support"
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/pcmcia/m32r_pcc.c')
0 files changed, 0 insertions, 0 deletions