Merge master.kernel.org:/home/rmk/linux-2.6-serial
commitd96299537e43681942ea272e00b0e529aa5b5fa4
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 29 Aug 2006 03:19:55 +0000 (28 20:19 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 29 Aug 2006 03:19:55 +0000 (28 20:19 -0700)
tree65e4df4142a7a0eb0ec0bfe70058771731e39194
parent1b8b22f44bc68b066c571ca2b5ab4fda123c15bd
parent737c17561fb2c6a72810cca7d7c0b8bdc29bb120
Merge master.kernel.org:/home/rmk/linux-2.6-serial

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] Support for Intashield 2 port PCI serial card