diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 08:07:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 08:07:00 -0400 |
| commit | 6e03f99803195e5aaf7f247db31b0d11857ccc35 (patch) | |
| tree | ffd4b1a140854977e984a4390105333845c0e90c /drivers/pci/dmar.c | |
| parent | 982162602b31041b426edec6480d327743abcbcc (diff) | |
| parent | 6bfb09a1005193be5c81ebac9f3ef85210142650 (diff) | |
Merge branch 'linus' into x86/iommu
Conflicts:
lib/swiotlb.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/pci/dmar.c')
0 files changed, 0 insertions, 0 deletions