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:
  [libata] pata_legacy: for VLB 32bit PIO don't try tricks with slop
  [libata] pata_amd: program FIFO
  sata_mv: fix SoC interrupt breakage
  pata_it821x: resume from hibernation fails with RAID volume

...

This commit is contained in:

Linus Torvalds 2009-02-25 15:12:48 -08:00

parent a36e4f0cab c55af1f5ab

commit c4eb1bf63f

4 changed files with 75 additions and 31 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

76

drivers/ata/pata_amd.c

View file

3

drivers/ata/pata_it821x.c

View file

7

drivers/ata/pata_legacy.c

View file

20

drivers/ata/sata_mv.c

View file