Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Jul 2006 04:31:05 +0000 (21:31 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Jul 2006 04:31:05 +0000 (21:31 -0700)
commit075395d228641646159dae3dd170fa3fc6ff477a
tree7cd5ace653d722549b23a2594140084c49bfcad6
parent060ec6f2fb3c8abb85927758de8ac5d1018e6a43
parent61a116ef29e712147d7ee7a6738886e6f91df5f5
Merge branch 'devel' of /home/rmk/linux-2.6-serial

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] Ensure 8250_pci quirks are not marked __devinit
  [SERIAL] Convert fifosize to an unsigned int
drivers/serial/8250_pci.c
drivers/serial/mpc52xx_uart.c
drivers/serial/serial_core.c
include/linux/serial_core.h