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-18 12:19:12 -08:00

parent 8907e94be2 e2b1be56c5

commit d4bf205305

2 changed files with 162 additions and 38 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/sata_mv.c

View file

197

drivers/scsi/sata_sil24.c

View file