diff options
| author | Joerg Roedel <joro@8bytes.org> | 2013-05-02 12:10:19 +0200 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2013-05-02 12:10:19 +0200 |
| commit | 0c4513be3d01a854867446ee793748409cc0ebdf (patch) | |
| tree | 08648dc4fa179e33b82758b9927b46ea6ac1564f /arch | |
| parent | ae3e7f3aba4441eca7a1ff5cb3e089824318ba79 (diff) | |
| parent | 83ed9c13e37e352b5a16caca01798c2766d91c29 (diff) | |
| parent | 80f97f0f73b82444f714651ea053838d27779dca (diff) | |
| parent | aa16bea929aed6ea854b55d2be8306a9fb40e694 (diff) | |
| parent | 72ca55dbae815745403364ad915d912e92da5b9a (diff) | |
Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next