| commit | eef11427edcb821b63920219f89379fab84198b9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Tue Jun 20 14:49:45 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Tue Jun 20 14:49:45 2006 -0700 |
| tree | 6a2863d3b2794958e30742bfb073a38e475989ae | |
| parent | c9ab09710ecb071031b0a04f3f9d7e686c0a75e0 [diff] | |
| parent | 14228a49913850493c7f9eb4501438c32da353f7 [diff] |
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