diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 12:53:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 12:53:15 -0800 |
| commit | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (patch) | |
| tree | 1ce09d319261627a03ce8ef75055f3f6a4a35ea7 /drivers/watchdog | |
| parent | 7962024e9d16e9349d76b553326f3fa7be64305e (diff) | |
| parent | 459ad68893a84fb0881e57919340b97edbbc3dc7 (diff) | |
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:
libata: kill spurious NCQ completion detection
ahci: don't attach if ICH6 is in combined mode
ata_piix: add Toshiba Tecra M4 to broken suspend list
ahci: fix engine reset failed message
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions