Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Mar 2006 02:04:54 +0000 (18:04 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Mar 2006 02:04:54 +0000 (18:04 -0800)
commit7986824e4e31d6c66f39d2f11ab93fcfed21f593
tree9ba2ea3d2a4a256e849697a7d757f8b544f4a016
parentd423421cb3e924cf68da231a732c3250c80afa4e
parentc4432c41b0c74d770ebc5e0a4fc3df3d00dfc131
Merge master.kernel.org:/home/rmk/linux-2.6-serial

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] ip22zilog: Fix oops on runlevel change with serial console
  [SERIAL] Fix two bugs in parport_serial