aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/include
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-16 17:53:34 -0700
committerOlof Johansson <olof@lixom.net>2012-09-16 17:53:58 -0700
commitbada1c5b49e4a66014f919b4bd95fca9dd3d04bd (patch)
tree38b84067b9700a0606025e126ae6282d2eede649 /arch/arm/mach-msm/include
parent73f5ae3132f8a3f1be76a6d3e76d783defbc22fc (diff)
parent10717e04d3502cf4a8aa6408d59093e2bbb4645b (diff)
parente63770acb3c1e7334885ed4673aed1375f93484a (diff)
Merge branches 'msm/fixes-non-critical' and 'msm/cleanup' into next/dt
Merging in fixes and cleanup as prereqs to simplify merge conflicts. * msm/fixes-non-critical: 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 * msm/cleanup: ARM: msm: Remove uncompiled board-msm7x27 ARM: msm: Remove unused acpuclock-arm11 ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail ARM: msm: Fix sparse warnings due to incorrect type ARM: msm: Remove unused idle.c ARM: msm: clock-pcom: Mark functions static ARM: msm: Remove msm_hw_reset_hook Signed-off-by: Olof Johansson <olof@lixom.net>