diff options
| author | Joerg Roedel <[email protected]> | 2011-06-21 09:14:10 +0000 |
|---|---|---|
| committer | Joerg Roedel <[email protected]> | 2011-06-21 09:14:10 +0000 |
| commit | 801019d59d4e1d1523e5897949fd3b6843571bd0 (patch) | |
| tree | 398a934d23eb28d3e555d5938c8abe52152fcd2f /net/tipc/msg.c | |
| parent | Linux 3.0-rc4 (diff) | |
| parent | x86/amd-iommu: Store device alias as dev_data pointer (diff) | |
| parent | iommu/amd: Move missing parts to drivers/iommu (diff) | |
| download | kernel-801019d59d4e1d1523e5897949fd3b6843571bd0.tar.gz kernel-801019d59d4e1d1523e5897949fd3b6843571bd0.zip | |
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 <[email protected]>