err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d7a80da d588fcb)

author	Jeff Garzik <jeff@garzik.org>
	Fri, 23 Jun 2006 02:11:56 +0000 (22:11 -0400)
committer	Jeff Garzik <jeff@garzik.org>
	Fri, 23 Jun 2006 02:11:56 +0000 (22:11 -0400)
commit	71d530cd1b6d97094481002a04c77fea1c8e1c22
tree	e786da7145d83c19a594adf76ed90d52c51058b1	tree \| snapshot
parent	d7a80dad2fe19a2b8c119c8e9cba605474a75a2b	commit \| diff
parent	d588fcbe5a7ba8bba2cebf7799ab2d573717a806	commit \| diff

Merge branch 'master' into upstream

Conflicts:

drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h

drivers/scsi/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libata-scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_vsc.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_error.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
include/scsi/scsi_cmnd.h	diff1 \|	diff2 \|	blob \| history

Linux 2.6 source tree