Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 19:31:54 +0000 (11:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 19:31:54 +0000 (11:31 -0800)
commitd195ea4b1456192abe780fd773778cbe9f6d77ea
tree25ea330c4fced145290f6f5cfb1b06a1cf8402c0
parentbb4bc81a234c66e8d8a4475110fa2d7988a34671
parentdf7559d3440ff759ff6e1371ff722bb3a73a3639
Merge master.kernel.org:/home/rmk/linux-2.6-serial
drivers/serial/imx.c