Merge with Linus' 2.6 tree
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 28 Jul 2005 08:30:20 +0000 (09:30 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 28 Jul 2005 08:30:20 +0000 (09:30 +0100)
1  2 
drivers/serial/8250_pci.c

Simple merge