diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-10-02 08:40:03 -0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-10-02 08:40:03 -0400 |
| commit | 009487258399cb4f431992919fa0f386d1b74ceb (patch) | |
| tree | 6e6bdafb4fa93a455c409bf9087fc60661cf464d /arch/arm | |
| parent | 759643ce39f13c416236e2609ccaed9792107b2f (diff) | |
| parent | e6bc59330e34626082a6b2e4733802e372781c8d (diff) | |
| parent | f8ffcc9279f90ba3790c6dc0f01207ad6ea1c8df (diff) | |
| parent | 500c25edda62a5d39c4d3b345c2e229a3f9d26be (diff) | |
| parent | 2e12bc29fc5a12242d68e11875db3dd58efad9ff (diff) | |
| parent | 44229b13bd74514ace76f7df40b388820a237288 (diff) | |
Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next
Conflicts:
drivers/iommu/amd_iommu_init.c