From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Jun 2006 21:49:45 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.18-rc1~1106
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eef11427edcb821b63920219f89379fab84198b9;p=linux-2.6

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

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI
---

eef11427edcb821b63920219f89379fab84198b9