diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 02:45:51 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 02:45:51 +0100 |
| commit | 2f44bbb495dd3e6d0209eff2257438ab9c570e5b (patch) | |
| tree | 5b65337043dd184b843e126226867a09fc7f4955 /drivers/acpi/toshiba_acpi.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| parent | [libata] Add support for the RB500 PATA CompactFlash (diff) | |
| download | linux-2f44bbb495dd3e6d0209eff2257438ab9c570e5b.tar.xz linux-2f44bbb495dd3e6d0209eff2257438ab9c570e5b.zip | |
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] 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
Diffstat (limited to 'drivers/acpi/toshiba_acpi.c')
0 files changed, 0 insertions, 0 deletions