diff options
| author | Joerg Roedel <joro@8bytes.org> | 2012-03-22 19:28:39 +0100 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2012-03-22 19:28:39 +0100 |
| commit | 7de473066f1512e52ea806e3c9698e5ea325b26c (patch) | |
| tree | b5a52e0846c2f3851349dfc4e6c8ed88e64f3db8 /arch | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
| parent | 09c32533c064782a7989b6fecce776833bca0e12 (diff) | |
| parent | ae295142d2d3989e49c6425c90d2593732a068a1 (diff) | |
Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next