Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu...
authorJoerg Roedel <joro@8bytes.org>
Thu, 9 Jan 2014 12:06:59 +0000 (13:06 +0100)
committerJoerg Roedel <joro@8bytes.org>
Thu, 9 Jan 2014 12:06:59 +0000 (13:06 +0100)
commitdd1a175695edf662615e422d1c85eae875a411b2
treef4b41a8ecfa0022de25ddc89dfde032fa8f111ca
parente2c22d9599ec9872894856405c0b62d04da5fd9b
parentcbff5634dcb78ae2c3a687de2b097fd26967604d
parent9f4c7448f46b881119998702530676b3400752a9
parente87c621dced122a9a0a51b56944b08421d273c8f
parentb82a2272b37af1f1f86ee6e5966ad941f9db5dc7
parentb3eb76d17570bd17d280e5d7deb8aad6b6d83d8a
parent5b5c13996ff115599e13b719fc7e4c39746d3b30
parent4c071c7b851ba47f66cdff523160225288382c7b
Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu', 'iommu/fixes' and 'arm/msm' into next
include/linux/iommu.h