Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

Browse source

...

This commit is contained in:

Linus Torvalds 2005-11-12 10:39:03 -08:00

parent 0fde7f5918 02eaa66629

commit ae5684ceb4

2 changed files with 33 additions and 8 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

32

drivers/scsi/ahci.c

View file

9

drivers/scsi/sata_qstor.c

View file