diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2011-06-21 05:14:10 -0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2011-06-21 05:14:10 -0400 |
| commit | 801019d59d4e1d1523e5897949fd3b6843571bd0 (patch) | |
| tree | 398a934d23eb28d3e555d5938c8abe52152fcd2f /arch/arm | |
| parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) | |
| parent | 71f77580906b60eb43daff0efb99792e76a3d06d (diff) | |
| parent | 403f81d8ee532c976d50a5e1051f14ec78ae8db3 (diff) | |
Merge branches 'amd/transparent-bridge' and 'core'
Conflicts:
arch/x86/include/asm/amd_iommu_types.h
arch/x86/kernel/amd_iommu.c
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>