Merge commit 8916-dev into msm-3.10
Merge support needed for the ARM64 8916 target into msm-3.10. * origin/tmp-b7dbbd5b: (289 commits) arm: add pdev_archdata for dma_mask thermal: tsens: fix compilation warning msm: sps: remove sps header file defconfig: arm64: msm: enable gpio sysfs reporting arm64: Align CMA sizes to PAGE_SIZE msm: ipa: add 64-bit support for IPA defconfig: msm: Enable IPC Router and QMI kernel interface msm: kgsl: Implement ioctl_rb_issueibcmds for compat msm: rndis_ipa: add support for 64 bit msm: ecm_ipa: add support for 64 bit ARM: dts: msm: Add SPI clocks for QUP1 on plutonium. ARM: dts: msm: Configure SPI on plutonium QUP1. msm: ipa: set dma mask of IPA device msm: ipa: add support for compat_ioctl msm: ipa: move out of mach tree arm: dts: msm8916: Change property for CMA regions arm64: Change type of dma_{alloc,free}_from_contiguous msm: kgsl: manage active count for perfcounter read compat ioctl ion: msm: Add custom compat ioctl ion: Add custom_compat_ioctl ... Conflicts: arch/arm/mach-msm/Kconfig drivers/platform/msm/ipa/teth_bridge.c Change-Id: I2e5ebfd104d72a91191fef6de33e107399c17938 Signed-off-by:Michael Bohan <mbohan@codeaurora.org>
Loading
Please register or sign in to comment