Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 23 Mar 2006 01:33:12 +0000 (17:33 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 23 Mar 2006 01:33:12 +0000 (17:33 -0800)
commit9d8f057acbd38d8177cf2ffd5e151d52c2477372
tree1c3387b045a8a487ff99bf3abed1cdf41670f6e6
parent591eb85ecd7e6eb8596c6129ae074e16636b99f4
parent91bca4b3e2f1aaaf67e62a36914f33ca1e7d5a06
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
drivers/serial/s3c2410.c
drivers/serial/serial_txx9.c
drivers/serial/sunsab.c
drivers/serial/sunsu.c
drivers/serial/sunzilog.c
drivers/serial/vr41xx_siu.c
include/linux/serial_core.h