Merge master.kernel.org:/home/rmk/linux-2.6-serial

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] Merge avlab serial board entries in parport_serial
  [SERIAL] kernel console should send CRLF not LFCR

diff --cc drivers/serial/s3c2410.c
Simple merge

diff --cc drivers/serial/serial_txx9.c
Simple merge

diff --cc drivers/serial/sunsab.c
Simple merge

diff --cc drivers/serial/sunsu.c
Simple merge

diff --cc drivers/serial/sunzilog.c
Simple merge

diff --cc drivers/serial/vr41xx_siu.c
Simple merge

diff --cc include/linux/serial_core.h
Simple merge