Merge branch 'linus' into tracing/urgent
[linux-2.6] / include / asm-sparc64 / dma-mapping.h
1 #include <asm-sparc/dma-mapping.h>