From: Linus Torvalds Date: Sat, 1 Apr 2006 05:36:51 +0000 (-0800) Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial X-Git-Tag: v2.6.17-rc1~21 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=683aa4012f53b2ada0f430487e05d37b0d94e90a;p=linux.git Merge master.kernel.org:/home/rmk/linux-2.6-serial * master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] Allow 8250 PCI, PNP, GSC and HP300 support to be disabled --- 683aa4012f53b2ada0f430487e05d37b0d94e90a