Merge by hand (conflicts in sd.c)
[pandora-kernel.git] / drivers / scsi / qlogicisp.c
2005-08-28 James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-15 Len BrownMerge ../to-linus-stable/
2005-08-04 Len Brown/home/lenb/src/to-linus-stable branch 'acpi-2.6.12'
2005-08-03 Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-30 Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-29 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-07-29 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-07-29 Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-07-29 Linus TorvaldsMerge head 'upstream' of /linux/kernel/git/jgarzik...
2005-07-27 Linus TorvaldsMerge head 'for-linus' of /linux/kernel/git/shaggy...
2005-07-27 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-07-27 Tony LuckAuto merge with /home/aegl/GIT/linus
2005-07-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-07-26 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-07-26 Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-arm-smp
2005-07-26 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-06-26 Christoph Hellwig[SCSI] remove scsi_set_device
2005-04-19 Linus TorvaldsMerge ... Greg's USB tree at /linux/kernel/git/gregkh...
2005-04-19 James Bottomleyfully merge up to scsi-misc-2.6
2005-04-18 <hch@lst.de>[PATCH] remove old scsi data direction macros
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2