merge by hand (fix up qla_os.c merge error)
[linux-2.6] / drivers / serial / imx.c
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-06  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-03  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-04-29  Linus TorvaldsMerge ... /home/rmk/linux-2.6-serial.git
2005-04-29  Sascha Hauer[PATCH] ARM: 2654/1: i.MX UART initialization sets...
2005-04-16  Pavel Machek[PATCH] fix u32 vs. pm_message_t in drivers/
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2