Merge branch 'master' into for-2.6.35
[pandora-kernel.git] / arch / mips / include / asm / serial.h
1 #include <asm-generic/serial.h>