CVSROOT: /var/cvs Module name: linux-2.5 Changes by: bame 02/12/10 17:43:51 Modified files: include/linux : serial.h Log message: minor merge-related fix