tree 1ca5384ec71f31bd9ae04d867952ca2ced00fe11
parent 311b79bb7e253dc5916db6dc14374dae0cd4ff9c
parent 3294a7e7c3a55bb4eb9d98b0af5643a7ea44afe1
author Kevin Hilman <khilman@linaro.org> 1376431922 -0700
committer Kevin Hilman <khilman@linaro.org> 1376431940 -0700

Merge branch 'msm/cleanup' into next/cleanup

From David Brown <davidb@codeaurora.org>:
* msm/cleanup:
  ARM: msm: Only compile io.c on platforms that use it
  iommu/msm: Move mach includes to iommu directory
  ARM: msm: Remove devices-iommu.c
  ARM: msm: Move mach/board.h contents to common.h
  ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
  ARM: msm: Remove TMR and TMR0 static mappings
  ARM: msm: Move debug-macro.S to include/debug
  ARM: msm: Don't compile __msm_ioremap_caller() unless used
  ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60

Signed-off-by: Kevin Hilman <khilman@linaro.org>