Merge branch 'master' into upstream
[linux-2.6] / include / asm-arm / arch-ixp23xx / dma.h
1 /*
2  * include/asm-arm/arch-ixp23xx/dma.h
3  */