tree 9ba2ea3d2a4a256e849697a7d757f8b544f4a016
parent d423421cb3e924cf68da231a732c3250c80afa4e
parent c4432c41b0c74d770ebc5e0a4fc3df3d00dfc131
author Linus Torvalds <torvalds@g5.osdl.org> 1141783494 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1141783494 -0800

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