summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Roedel <joro@8bytes.org>2013-05-02 14:10:19 +0400
committerJoerg Roedel <joro@8bytes.org>2013-05-02 14:10:19 +0400
commit0c4513be3d01a854867446ee793748409cc0ebdf (patch)
tree08648dc4fa179e33b82758b9927b46ea6ac1564f
parentae3e7f3aba4441eca7a1ff5cb3e089824318ba79 (diff)
parent83ed9c13e37e352b5a16caca01798c2766d91c29 (diff)
parent80f97f0f73b82444f714651ea053838d27779dca (diff)
parentaa16bea929aed6ea854b55d2be8306a9fb40e694 (diff)
parent72ca55dbae815745403364ad915d912e92da5b9a (diff)
downloadlinux-0c4513be3d01a854867446ee793748409cc0ebdf.tar.xz
Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next