Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Browse source

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_nv: give up hardreset on nf2
  libata-sff: fix 32-bit PIO ATAPI regression

...

This commit is contained in:

Linus Torvalds 2009-02-17 14:16:02 -08:00

parent 51f267739a 7dac745b8e

commit 0637810f24

2 changed files with 29 additions and 13 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

28

drivers/ata/libata-sff.c

View file

14

drivers/ata/sata_nv.c

View file