From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 23 Mar 2006 01:33:12 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.17-rc1~1121
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=9d8f057acbd38d8177cf2ffd5e151d52c2477372

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
---

9d8f057acbd38d8177cf2ffd5e151d52c2477372