diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-09-16 17:39:21 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-16 17:39:21 -0700 |
| commit | 0e7d35c1fb708355ccef7cc4243509a3156c839b (patch) | |
| tree | 52271a65ddb479a0cb7d2878fcb0be398027aacc /arch/arm/mach-exynos/mach-origen.c | |
| parent | Merge tag 'imx-boards' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards (diff) | |
| parent | ARM: msm: Allow 8960 and 8660 to compile together (diff) | |
| download | linux-dev-0e7d35c1fb708355ccef7cc4243509a3156c839b.tar.xz linux-dev-0e7d35c1fb708355ccef7cc4243509a3156c839b.zip | |
Merge tag 'msm-board-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/boards
Final parts to allow msm8660 and msm8960 to build into the same
kernel. This won't work without the changes from msm-dt-for-3.7.
* tag 'msm-board-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
ARM: msm: Allow 8960 and 8660 to compile together
ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
Diffstat (limited to 'arch/arm/mach-exynos/mach-origen.c')
0 files changed, 0 insertions, 0 deletions