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-13 13:45:00 -08:00

parent 41866a56cc dcc2d1e7f0

commit 4ba529a8a3

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

3

drivers/scsi/libata-core.c

View file

6

drivers/scsi/libata-scsi.c

View file

1

drivers/scsi/sata_sil24.c

View file