From: Linus Torvalds Date: Thu, 6 Jan 2011 21:36:30 +0000 (-0800) Subject: Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm X-Git-Tag: MMI-PSA29.97-13-9~21443 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b69fc2efc9205d58c820eb2eb1caa6bf873b4b0d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm * 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (35 commits) mmc: msm_sdcc: Check for only DATA_END interrupt to end a request mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned mmc: msm_sdcc: Reset SDCC in case of data transfer errors mmc: msm_sdcc: Add prog done interrupt support mmc: msm_sdcc: Fix possible circular locking dependency warning MSM: Add USB support for MSM7x30 MSM: Add USB suport for QSD8x50 msm: initial framebuffer support msm: add handling for clocks tagged as CLK_MINMAX msm: trout: change name of pmdh_clk to mddi_clk msm: add CLK_MINMAX to pmdh_clk msm: trout: add gpio_to_irq msm: iommu: Use the correct memory allocation flag msm_serial: Remove redundant unlikely() msm: iommu: Miscellaneous code cleanup msm: iommu: Support cache-coherent memory access msm: iommu: Definitions for extended memory attributes msm: iommu: Kconfig dependency for the IOMMU API msm: iommu: Check if device is already attached msm: iommu: Kconfig item for cacheable page tables ... --- b69fc2efc9205d58c820eb2eb1caa6bf873b4b0d