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: don't set IORDY for reset
  sata_fsl: Add power mgmt support
  [libata] PATA driver for CF interface on AT91SAM9260 SoC
  [libata] beautify module parameters

...

This commit is contained in:

Linus Torvalds 2009-06-23 10:39:36 -07:00

parent 4843a3baf2 0d9e6659a1

commit 811e42cfba

5 changed files with 420 additions and 10 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

8

drivers/ata/Kconfig

View file

1

drivers/ata/Makefile

View file

25

drivers/ata/libata-core.c

View file

361

drivers/ata/pata_at91.c

View file

35

drivers/ata/sata_fsl.c

View file