summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorLinus Torvalds2013-12-12 19:20:58 +0100
committerLinus Torvalds2013-12-12 19:20:58 +0100
commit319720f534d88039615bceb88d4bc094a7cd4ce9 (patch)
tree85f6a53e2926de546f02c3f60acf7303984121b7 /include/asm-generic
parentMerge tag 'keys-devel-20131210' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentMerge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux... (diff)
downloadkernel-qcow2-linux-319720f534d88039615bceb88d4bc094a7cd4ce9.tar.gz
kernel-qcow2-linux-319720f534d88039615bceb88d4bc094a7cd4ce9.tar.xz
kernel-qcow2-linux-319720f534d88039615bceb88d4bc094a7cd4ce9.zip
Merge tag 'iommu-fixes-for-v3.13-rc4' of git://github.com/awilliam/linux-vfio
Pull iommu fixes from Alex Williamson: "arm/smmu driver updates via Will Deacon fixing locking around page table walks and a couple other issues" * tag 'iommu-fixes-for-v3.13-rc4' of git://github.com/awilliam/linux-vfio: iommu/arm-smmu: fix error return code in arm_smmu_device_dt_probe() iommu/arm-smmu: remove potential NULL dereference on mapping path iommu/arm-smmu: use mutex instead of spinlock for locking page tables
Diffstat (limited to 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions