]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit26902acff63d7fad7aefcf7a22c53f1f4efde740
tree6a2863d3b2794958e30742bfb073a38e475989ae
parent748039902c75f33516838ba529dadccedc381413
parentcdb771180fc8fbf1eb53fbbc885fd7983f46077c
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