diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-03 22:40:34 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-03 22:40:34 +0200 |
| commit | 77e3c09e451ae78b64f7b89fc1690804da726787 (patch) | |
| tree | 1abe2bd35f4750108c5335250174315c0e46f719 /arch/powerpc/kernel/iommu.c | |
| parent | ARM: cns3xxx: don't export static symbol (diff) | |
| parent | ARM: DRA7: Enable Cortex A15 errata 798181 (diff) | |
| download | linux-77e3c09e451ae78b64f7b89fc1690804da726787.tar.xz linux-77e3c09e451ae78b64f7b89fc1690804da726787.zip | |
Merge tag 'omap-for-v4.1/fixes-0' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
Merge "omap non-urgent fixes for v4.1" from Tony Lindgren:
Fixes for omaps that were not considered urgent enough for the -rc cycle.
This is mostly to enable errata 798181 and thermal support for dra7,
configure ocp2scp for am437x, remove dead code for OMAP4_ERRATA_I688
and fix build warnings for omap1510 only config.
* tag 'omap-for-v4.1/fixes-0' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: DRA7: Enable Cortex A15 errata 798181
ARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102
ARM: dts: DRA7: Add bandgap and related thermal nodes
bus: ocp2scp: SYNC2 value should be changed to 0x6
ARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for OCP2SCP
ARM: OMAP2+: remove superfluous NULL pointer check
ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688
MAINTAINERS: add OMAP defconfigs under OMAP SUPPORT
ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/powerpc/kernel/iommu.c')
0 files changed, 0 insertions, 0 deletions