diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-17 02:31:49 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-17 02:31:49 +0200 |
| commit | ca43af527e3892802853a87375de1fb0d704d3bb (patch) | |
| tree | 04adc902cd655aca57639f1d1a7b2cac68a53d19 /arch/um/Makefile-skas | |
| parent | Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into next... (diff) | |
| parent | ARM: msm: Fix early debug uart mapping on some memory configs (diff) | |
| download | linux-ca43af527e3892802853a87375de1fb0d704d3bb.tar.xz linux-ca43af527e3892802853a87375de1fb0d704d3bb.zip | |
Merge tag 'msm-fix-noncrit-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/fixes-non-critical
From David Brown:
Some non-critical fixes for msm platforms. The missing FPGA init call
fix is necessary to compile the 8660 target. The iomapping calls are
needed to prevent duplicate mappings with differing attributes. And,
the debug UART change keeps the debug UART working on targets with
more than 512MB of memory.
* tag 'msm-fix-noncrit-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
ARM: msm: Fix early debug uart mapping on some memory configs
ARM: msm: io: Change the default static iomappings to be shared
ARM: msm: io: Remove 7x30 iomap region from 7x00
ARM: msm: Remove call to missing FPGA init on 8660
Diffstat (limited to 'arch/um/Makefile-skas')
0 files changed, 0 insertions, 0 deletions