diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 19:29:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 19:29:32 -0800 |
| commit | ededa4d396b15c282aa60d6aacddfc07f0142dbf (patch) | |
| tree | dc8af166ac6f7332e5a885675dec222a0494de41 /drivers/net/wireless/iwlwifi/iwl4965-base.c | |
| parent | 64396accc2831fcbdc7d793edc25481a5ebc75b2 (diff) | |
| parent | 140b5e59119a172a91b5fa13d54ca4f79bbefee1 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: fix ATAPI draining
libata: update atapi_eh_request_sense() such that lbam/lbah contains buffer size
libata-acpi: implement _GTF command filtering
libata-acpi: improve _GTF execution error handling and reporting
libata-acpi: improve ACPI disabling
libata-acpi: implement dev->gtf_cache and evaluate _GTF right after _STM during resume
libata-acpi: implement and use ata_acpi_init_gtm()
libata-acpi: add new hooks ata_acpi_dissociate() and ata_acpi_on_disable()
libata: ata_dev_disable() should be called from EH context
libata: add more opcodes to ata.h
libata: update ata_*_printk() macros such that level can be a variable
libata-acpi: adjust constness in ata_acpi_gtm/stm() parameters
sata_mv: improve warnings about Highpoint RocketRAID 23xx cards
libata: add ST3160023AS / 3.42 to NCQ blacklist
libata: clear link->eh_info.serror from ata_std_postreset()
sata_sil: fix spurious IRQ handling
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
0 files changed, 0 insertions, 0 deletions