Merge branch 'devel' of master.kernel.org:/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

diff --cc drivers/serial/8250_pci.c
Simple merge

diff --cc drivers/serial/mpc52xx_uart.c
Simple merge

diff --cc drivers/serial/serial_core.c
Simple merge

diff --cc include/linux/serial_core.h
Simple merge