Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 29 Aug 2006 03:19:55 +0000 (20:19 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 29 Aug 2006 03:19:55 +0000 (20:19 -0700)
* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] Support for Intashield 2 port PCI serial card


Trivial merge