Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Jun 2006 21:49:45 +0000 (14:49 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Jun 2006 21:49:45 +0000 (14:49 -0700)
commiteef11427edcb821b63920219f89379fab84198b9
tree6a2863d3b2794958e30742bfb073a38e475989ae
parentc9ab09710ecb071031b0a04f3f9d7e686c0a75e0
parent14228a49913850493c7f9eb4501438c32da353f7
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