From: Kevin Hilman Date: Tue, 13 Aug 2013 22:12:02 +0000 (-0700) Subject: Merge branch 'msm/cleanup' into next/cleanup X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bee22087faf5bbf33fcb61e6c5e8f8ef7ebd77a5;p=linux-beck.git Merge branch 'msm/cleanup' into next/cleanup From David Brown : * 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 --- bee22087faf5bbf33fcb61e6c5e8f8ef7ebd77a5