tree fc39655b6fcac0aea52db3c1d534b31efd42a7d4
parent c243e5284371eb90af2c6771af60fa54c57513a4
parent 50ede4e39aa5b61685ca87f58422478b1a538ca8
author David Brown <davidb@codeaurora.org> 1295896611 -0800
committer David Brown <davidb@codeaurora.org> 1295896611 -0800

Merge branch 'msm-8960' into for-next

* msm-8960:
  msm: Support for the MSM8960 RUMI3 target
  msm: Support for the MSM8960 Simulator target
  msm: Makefile cleanup
  msm: timer: Timer support for MSM8960
  msm: Add MSM 8960 cpu_is check
  msm: irqs-8960: Interrupt map for MSM8960
  msm: Physical offset for MSM8960
  msm: io: I/O register definitions for MSM8960
  msm: Generalize QGIC registers
  msm: Generalize timer register mappings
  msm: Add CPU queries