summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2014-01-09 13:06:59 +0100
committerJoerg Roedel <joro@8bytes.org>2014-01-09 13:06:59 +0100
commitdd1a175695edf662615e422d1c85eae875a411b2 (patch)
treef4b41a8ecfa0022de25ddc89dfde032fa8f111ca /include/linux
parente2c22d9599ec9872894856405c0b62d04da5fd9b (diff)
parentcbff5634dcb78ae2c3a687de2b097fd26967604d (diff)
parent9f4c7448f46b881119998702530676b3400752a9 (diff)
parente87c621dced122a9a0a51b56944b08421d273c8f (diff)
parentb82a2272b37af1f1f86ee6e5966ad941f9db5dc7 (diff)
parentb3eb76d17570bd17d280e5d7deb8aad6b6d83d8a (diff)
parent5b5c13996ff115599e13b719fc7e4c39746d3b30 (diff)
parent4c071c7b851ba47f66cdff523160225288382c7b (diff)
downloadlinux-stable-dd1a175695edf662615e422d1c85eae875a411b2.tar.gz
linux-stable-dd1a175695edf662615e422d1c85eae875a411b2.tar.bz2
linux-stable-dd1a175695edf662615e422d1c85eae875a411b2.zip
Merge branches 'arm/smmu', 'core', 'x86/vt-d', 'arm/shmobile', 'x86/amd', 'ppc/pamu', 'iommu/fixes' and 'arm/msm' into next