Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[cascardo/linux.git] / drivers / scsi / sym53c8xx_2 / sym_nvram.h
2006-01-05 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-01-05 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2005-12-15 James BottomleyMerge by hand (conflicts in scsi_lib.c)
2005-12-14 Matthew Wilcox[SCSI] sym2: Allow NVRAM settings to limit speed and...
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2