aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 14:49:45 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 14:49:45 -0700
commiteef11427edcb821b63920219f89379fab84198b9 (patch)
tree6a2863d3b2794958e30742bfb073a38e475989ae /init
parentMerge master.kernel.org:/home/rmk/linux-2.6-mmc (diff)
parent[SERIAL] PARPORT_SERIAL should depend on SERIAL_8250_PCI (diff)
downloadlinux-dev-eef11427edcb821b63920219f89379fab84198b9.tar.xz
linux-dev-eef11427edcb821b63920219f89379fab84198b9.zip
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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions