Home
last modified time | relevance | path

Searched hist:dd1dc802368154a75926491092ec9e6a939c32df (Results 1 – 2 of 2) sorted by relevance

/openbmc/linux/drivers/ata/
H A Data_piix.cdiff dd1dc802368154a75926491092ec9e6a939c32df Mon Sep 11 07:54:55 CDT 2006 Jeff Garzik <jeff@garzik.org> Merge branch 'upstream-fixes' into upstream

Conflicts:

drivers/ata/ata_piix.c
H A Dsata_mv.cdiff dd1dc802368154a75926491092ec9e6a939c32df Mon Sep 11 07:54:55 CDT 2006 Jeff Garzik <jeff@garzik.org> Merge branch 'upstream-fixes' into upstream

Conflicts:

drivers/ata/ata_piix.c