Merge branch 'upstream-fixes' into upstream

Browse source

Conflicts:

	drivers/scsi/libata-core.c

...

This commit is contained in:

Jeff Garzik 2006-05-28 16:32:59 -04:00

parent 75e995855f 0737ac895a

commit e42d7be25c

1 changed files with 3 additions and 0 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