Merge Christoph's freeze cleanup patch
[linux-2.6] / drivers / scsi / atp870u.c
2005-06-21  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-20  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-06-20  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-06-19  Russell KingMerge with ../linux-2.6-smp
2005-06-18  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-06-18  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dwmw2/audit-2.6
2005-06-18  Linus TorvaldsMerge 'upstream-2.6.13' branch of /linux/kernel/git...
2005-06-18  Linus TorvaldsManual merge of /linux/kernel/git/jgarzik/netdev-2...
2005-06-18  James Bottomleymerge by hand (qla_os.c mismerge)
2005-06-17  James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-05-26  James BottomleyAutomatic merge of ../scsi-misc-2.6-old/
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-20  Adrian Bunk [SCSI] drivers/scsi/atp870u.c: make a function static
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2