From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 4 Jul 2006 04:31:05 +0000 (-0700)
Subject: Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.18-rc1~18
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=075395d228641646159dae3dd170fa3fc6ff477a

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
---

075395d228641646159dae3dd170fa3fc6ff477a