summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'iommu-updates-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2016-03-2225-414/+2953
|\
| *-----------. Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm...Joerg Roedel2016-03-2125-414/+2953
| |\ \ \ \ \ \ \
| | | | | | | | * iommu/dma: Fix NEED_SG_DMA_LENGTH dependencyRobin Murphy2016-02-291-1/+1
| | | | | | | | * iommu: Fix second argument of trace_map() to report correct paddrYoshihiro Shimoda2016-02-251-1/+2
| | | | | | | * | iommu/ipmmu-vmsa: Add r8a7795 DT bindingMagnus Damm2016-03-031-2/+13
| | | | | | | * | iommu/ipmmu-vmsa: Use ARCH_RENESASSimon Horman2016-02-251-1/+1
| | | | | | | |/
| | | | | | * | iommu/io-pgtable-armv7s: Fix kmem_cache_alloc() flagsRobin Murphy2016-03-021-1/+1
| | | | | * | | iommu/mediatek: Check for NULL instead of IS_ERR()Dan Carpenter2016-03-021-3/+3
| | | | | * | | iommu/mediatek: Fix handling of of_count_phandle_with_args resultAndrzej Hajda2016-03-011-2/+1
| | | | | * | | iommu/mediatek: Mark PM functions as __maybe_unusedArnd Bergmann2016-02-291-2/+2
| | | | | * | | iommu/mediatek: Select ARM_DMA_USE_IOMMUArnd Bergmann2016-02-291-0/+1
| | | | | * | | dts: mt8173: Add iommu/smi nodes for mt8173Yong Wu2016-02-251-0/+81
| | | | | * | | iommu/mediatek: Add mt8173 IOMMU driverYong Wu2016-02-253-0/+754
| | | | | * | | memory: mediatek: Add SMI driverYong Wu2016-02-254-0/+340
| | | | | * | | dt-bindings: mediatek: Add smi dts bindingYong Wu2016-02-253-0/+160
| | | | | * | | dt-bindings: iommu: Add binding for mediatek IOMMUYong Wu2016-02-251-0/+68
| | | | | |/ /
| | | | | * | Merge branch 'for-joerg/io-pgtable' of git://git.kernel.org/pub/scm/linux/ker...Joerg Roedel2016-02-257-17/+943
| | | | | |\ \ | | | | | | |/ | | | | | |/|
| | | | | | * MAINTAINERS: update ARM SMMU entryWill Deacon2016-02-171-0/+2
| | | | | | * iommu/io-pgtable: Rationalise quirk handlingRobin Murphy2016-02-173-6/+34
| | | | | | * iommu/io-pgtable: Avoid redundant TLB syncsRobin Murphy2016-02-171-1/+8
| | | | | | * iommu/io-pgtable: Add helper functions for TLB opsRobin Murphy2016-02-174-41/+46
| | | | | | * iommu/io-pgtable: Add ARMv7 short descriptor supportRobin Murphy2016-02-175-1/+885
| | | | * | | Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/lin...Joerg Roedel2016-02-253-52/+78
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | iommu/arm-smmu: Treat IOMMU_DOMAIN_DMA as bypass for nowWill Deacon2016-02-182-1/+13
| | | | | * | iommu/arm-smmu: Don't fail device attach if already attached to a domainWill Deacon2016-02-182-40/+26
| | | | | * | iommu/arm-smmu: Allow disabling unmatched stream bypassRobin Murphy2016-02-181-8/+16
| | | | | * | of: iommu: Increment DT node refcount in of_iommu_set_ops()Anup Patel2016-02-181-0/+1
| | | | | * | iommu/arm-smmu: Support DMA-API domainsRobin Murphy2016-02-182-2/+18
| | | | | * | iommu/arm-smmu: Treat all device transactions as unprivilegedRobin Murphy2016-02-181-1/+4
| | | | | |/
| | | * | | iommu/exynos: Use proper readl/writel register interfaceMarek Szyprowski2016-02-291-19/+19
| | | * | | iommu/exynos: Pointers are nto physical addressesArnd Bergmann2016-02-291-1/+1
| | | * | | iommu/exynos: Support multiple attach_device callsMarek Szyprowski2016-02-251-32/+40
| | | * | | iommu/exynos: Add Maintainers entry for Exynos SYSMMU driverMarek Szyprowski2016-02-251-0/+6
| | | * | | iommu/exynos: Add support for v5 SYSMMUMarek Szyprowski2016-02-253-51/+143
| | | * | | iommu/exynos: Update device tree documentationMarek Szyprowski2016-02-251-11/+8
| | | * | | iommu/exynos: Add support for SYSMMU controller with bogus version regMarek Szyprowski2016-02-251-1/+23
| | | * | | iommu/exynos: Unify code for fldp cache invalidationMarek Szyprowski2016-02-251-9/+4
| | | * | | iommu/exynos: Refactor init config codeMarek Szyprowski2016-02-251-16/+9
| | | * | | iommu/exynos: Refactor fault handling codeMarek Szyprowski2016-02-251-68/+41
| | | * | | iommu/exynos: Refactor code (no direct register access)Marek Szyprowski2016-02-251-21/+19
| | | * | | iommu/exynos: Simplify master clock operationsMarek Szyprowski2016-02-251-20/+12
| | | * | | iommu/exynos: Remove ARM-specific cache flush interfaceMarek Szyprowski2016-02-251-25/+49
| | | * | | iommu/exynos: Add support for IOMMU_DOMAIN_DMA domain typeMarek Szyprowski2016-02-251-4/+15
| | | * | | iommu/exynos: Rework iommu group initializationMarek Szyprowski2016-02-251-11/+16
| | | |/ /
| | * | | iommu/rockchip: Reconstruct to support multi slavesZhengShunQian2016-01-291-79/+135
* | | | | Merge branch 'for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2016-03-2136-931/+1102
|\ \ \ \ \
| * | | | | btrfs: make sure we stay inside the bvec during __btrfs_lookup_bio_sumsChris Mason2016-03-211-0/+10
| * | | | | btrfs: Fix misspellings in comments.Adam Buchbinder2016-03-1410-16/+16
| * | | | | btrfs: Print Warning only if ENOSPC_DEBUG is enabledAshish Samant2016-03-141-1/+6
| * | | | | btrfs: scrub: silence an uninitialized variable warningDan Carpenter2016-03-111-1/+1