Merge branch 'upstream-fixes' into upstream

Browse source

Conflicts:

	drivers/scsi/libata-core.c

...

This commit is contained in:

Jeff Garzik 2006-05-24 01:49:12 -04:00

parent d3fb4e8ddd bb31a8faa2

commit c81e29b4ac

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

4

drivers/scsi/libata-core.c

View file