]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9ab097 14228a4)
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)
* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI


Trivial merge
Linux 2.6 source tree