3.0.40

Conflicts:

	Makefile
	drivers/scsi/scsi_sysfs.c