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] Add support for the RB500 PATA CompactFlash
  ahci: logical-bitwise and confusion in ahci_save_initial_config()
  libata: don't allow sysfs read access to force param
  ahci: add the Device IDs for nvidia MCP7B AHCI
  libata-sff: handle controllers w/o ctl register
  libata: allow LLDs w/o any reset method
  ata: replace remaining __FUNCTION__ occurrences

...

This commit is contained in:

Linus Torvalds 2008-03-10 18:45:51 -07:00

parent 2b752acd91 3db691daa4

commit 2f44bbb495

9 changed files with 383 additions and 28 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

9

drivers/ata/Kconfig

View file

1

drivers/ata/Makefile

View file

14

drivers/ata/ahci.c

View file

8

drivers/ata/libata-acpi.c

View file

17

drivers/ata/libata-core.c

View file

10

drivers/ata/libata-eh.c

View file

36

drivers/ata/libata-sff.c

View file

2

drivers/ata/pata_pdc2027x.c

View file

314

drivers/ata/pata_rb500_cf.c

View file