diff options
| author | Ingo Molnar <[email protected]> | 2016-05-05 07:56:10 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2016-05-05 07:56:10 +0000 |
| commit | 3cd0b53553ce28da6fc828c601041c974e1c4dde (patch) | |
| tree | eb05932753a4afb9d3c82949ef056085f79be1b5 /lib/dma-debug.c | |
| parent | x86/platform/UV: Fix incorrect nodes and pnodes for cpuless and memoryless nodes (diff) | |
| parent | x86/platform/UV: Bring back the call to map_low_mmrs in uv_system_init (diff) | |
| download | kernel-3cd0b53553ce28da6fc828c601041c974e1c4dde.tar.gz kernel-3cd0b53553ce28da6fc828c601041c974e1c4dde.zip | |
Merge branch 'x86/urgent' into x86/platform, to resolve conflict
Conflicts:
arch/x86/kernel/apic/x2apic_uv_x.c
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'lib/dma-debug.c')
0 files changed, 0 insertions, 0 deletions