Merge branch 'upstream'

Browse source

...

This commit is contained in:

Jeff Garzik 2006-02-20 16:56:08 -05:00

parent a5fd79ccd6 f131883e73

commit 11fff8287f

4 changed files with 67 additions and 47 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

78

drivers/scsi/ata_piix.c

View file

18

drivers/scsi/libata-core.c

View file

2

drivers/scsi/sata_qstor.c

View file

16

include/linux/libata.h

View file