From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 8 Mar 2006 02:04:54 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.16-rc6~81
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7986824e4e31d6c66f39d2f11ab93fcfed21f593;p=~emulex%2Finfiniband.git

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

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] ip22zilog: Fix oops on runlevel change with serial console
  [SERIAL] Fix two bugs in parport_serial
---

7986824e4e31d6c66f39d2f11ab93fcfed21f593