Merge by hand (conflicts in sr.c)
[linux-2.6] / drivers / serial / cpm_uart / cpm_uart_core.c
2005-08-28  James BottomleyMerge by hand (conflicts in sr.c)
2005-08-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-tmp
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-15  Len BrownMerge ../to-linus-stable/
2005-08-10  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2005-08-10  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-08-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-08-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-08-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-08-09  Kumar Gala[PATCH] cpm_uart: needs some love to compile with GCC4.0.1
2005-08-09  Kumar Gala[PATCH] cpm_uart: Fix dpram allocation and non-console...
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2