diff options
author | David Brown <davidb@codeaurora.org> | 2011-01-24 11:16:51 -0800 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2011-01-24 11:16:51 -0800 |
commit | 75b0d32d5c0acd9b28f447aeddde5e94e5d64e5d (patch) | |
tree | fc39655b6fcac0aea52db3c1d534b31efd42a7d4 /arch/arm/include/asm/delay.h | |
parent | c243e5284371eb90af2c6771af60fa54c57513a4 (diff) | |
parent | 50ede4e39aa5b61685ca87f58422478b1a538ca8 (diff) | |
download | linux-75b0d32d5c0acd9b28f447aeddde5e94e5d64e5d.tar.gz linux-75b0d32d5c0acd9b28f447aeddde5e94e5d64e5d.tar.bz2 linux-75b0d32d5c0acd9b28f447aeddde5e94e5d64e5d.zip |
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
Diffstat (limited to 'arch/arm/include/asm/delay.h')
0 files changed, 0 insertions, 0 deletions