From: Linus Torvalds Date: Tue, 20 Jun 2006 21:49:45 +0000 (-0700) Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eef11427edcb821b63920219f89379fab84198b9;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- eef11427edcb821b63920219f89379fab84198b9