diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-04 20:20:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 20:20:10 +0100 |
| commit | 6d2e91bf80e4410207f01edb0962aec9213f3533 (patch) | |
| tree | d9e63711b0958748accff409596eca742a3c360b /lib/dma-debug.c | |
| parent | x86: set_highmem_pages_init() cleanup, #2 (diff) | |
| parent | x86: EFI: Back efi_ioremap with init_memory_mapping instead of FIX_MAP (diff) | |
| download | linux-rng-6d2e91bf80e4410207f01edb0962aec9213f3533.tar.xz linux-rng-6d2e91bf80e4410207f01edb0962aec9213f3533.zip | |
Merge branch 'x86/urgent' into x86/mm
Conflicts:
arch/x86/include/asm/fixmap_64.h
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/dma-debug.c')
0 files changed, 0 insertions, 0 deletions