git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c2a6585 a145410)

author	Jeff Garzik <jeff@garzik.org>
	Tue, 11 Apr 2006 16:51:40 +0000 (12:51 -0400)
committer	Jeff Garzik <jeff@garzik.org>
	Tue, 11 Apr 2006 16:51:40 +0000 (12:51 -0400)
commit	10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1
tree	eddf856286234f28cac747d20eb59d918e1bc8b5	tree \| snapshot
parent	c2a6585296009379e0f4eff39cdcb108b457ebf2	commit \| diff
parent	a145410dccdb44f81d3b56763ef9b6f721f4e47c	commit \| diff

Merge branch 'master'

Conflicts:

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

17 files changed:

drivers/scsi/ahci.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ata_piix.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libata-scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/pdc_adma.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_mv.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_nv.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_promise.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_qstor.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_sil.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_sil24.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_sis.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_svw.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_sx4.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_uli.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_via.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sata_vsc.c	diff1 \|	diff2 \|	blob \| history
include/linux/libata.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules