Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
[pandora-kernel.git] / arch / mips / include / asm / parport.h
1 #include <asm-generic/parport.h>