]> err.no Git - linux-2.6/commitdiff
Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 1 Apr 2006 05:36:51 +0000 (21:36 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 1 Apr 2006 05:36:51 +0000 (21:36 -0800)
* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] Allow 8250 PCI, PNP, GSC and HP300 support to be disabled


Trivial merge