Merge branch 'x86/core' into x86/cleanups
[linux-2.6] / arch / arm / mach-loki / include / mach / dma.h
1 /* empty */