]> err.no Git - linux-2.6/commitdiff
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)
* '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

1  2 
drivers/serial/8250_pci.c
drivers/serial/mpc52xx_uart.c
drivers/serial/serial_core.c
include/linux/serial_core.h

Simple merge
Simple merge
Simple merge
Simple merge