diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 16:03:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 16:03:03 -0700 |
commit | fb2c922b8588115d8914492493a37109bfb07884 (patch) | |
tree | 9b532d2989d998b1997bf04eae0f3eb15f1843b5 /drivers/spi | |
parent | 9ce3075c20d458040138690edfdf6446664ec3ee (diff) | |
parent | b9a3b4d1453689f2927668fcdc4827fdccf44d1b (diff) | |
download | op-kernel-dev-fb2c922b8588115d8914492493a37109bfb07884.zip op-kernel-dev-fb2c922b8588115d8914492493a37109bfb07884.tar.gz |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_platform: don't use generic ata_port_start
Use menuconfig objects: libata
add the ATI SB700 SATA controller device id to AHCI pci table
Add the combined mode for ATI SB700
pata_pcmcia: recognize 2GB CompactFlash from Transcend
git-libata-all: sata_via build fix
libata-acpi: clean up parameters and misc stuff
libata-acpi: s/CONFIG_SATA_ACPI/CONFIG_ATA_ACPI/
libata: give devices one last chance even if recovery failed with -EINVAL
libata: fallback to the other IDENTIFY on device error, take#2
libata: ignore EH scheduling during initialization
libata: clean up SFF init mess
libata: implement libata.spindown_compat
libata: reimplement suspend/resume support using sdev->manage_start_stop
Diffstat (limited to 'drivers/spi')
0 files changed, 0 insertions, 0 deletions