Merge branch 'upstream'

Browse source

...

This commit is contained in:

Jeff Garzik 2005-12-13 02:32:01 -05:00

parent d1397f8376 e508a391a0

commit e8b0942848

2 changed files with 6 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

7

drivers/scsi/libata-scsi.c

View file

1

include/linux/libata.h

View file