summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2012-03-22 22:28:39 +0400
committerJoerg Roedel <joro@8bytes.org>2012-03-22 22:28:39 +0400
commit7de473066f1512e52ea806e3c9698e5ea325b26c (patch)
treeb5a52e0846c2f3851349dfc4e6c8ed88e64f3db8 /arch
parentc16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff)
parent09c32533c064782a7989b6fecce776833bca0e12 (diff)
parentae295142d2d3989e49c6425c90d2593732a068a1 (diff)
downloadlinux-7de473066f1512e52ea806e3c9698e5ea325b26c.tar.xz
Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next