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

Browse source

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] sata_sis: use correct S/G table size
  pata_cs5536: MWDMA fix
  sata_sis: fix SCR read breakage
  libata: fix kernel-doc param name

...

This commit is contained in:

Linus Torvalds 2007-10-19 20:34:29 -07:00

parent b35e704118 96af154710

commit b3d9d6be03

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

2

drivers/ata/libata-core.c

View file

4

drivers/ata/pata_cs5536.c

View file

15

drivers/ata/sata_sis.c

View file