diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-10 14:26:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-10 14:26:04 -0800 |
| commit | 487350e4434610e31b71eac5d6a9714b72fa32f6 (patch) | |
| tree | bf09b2cd0e09091784eac9fc8041358c69ac3c7c /drivers/net/slip.c | |
| parent | 1da63a2131b0185f64a4c623a0e0b030479185fe (diff) | |
| parent | 037f6bb79f753c014bc84bca0de9bf98bb5ab169 (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: Don't fail device revalidation for bad _GTF methods
libata: port and host should be stopped before hardware resources are released
libata: skip 0xff polling for PATA controllers
libata: pata_platform: Support polling-mode configuration.
libata: Support PIO polling-only hosts.
libata sata_qstor conversion to new error handling (EH).
libata sata_qstor workaround for spurious interrupts
libata sata_qstor nuke idle state
nv_hardreset: update dangling reference to bugzilla entry
ata_piix: add SATELLITE PRO U200 to broken suspend list
Diffstat (limited to 'drivers/net/slip.c')
0 files changed, 0 insertions, 0 deletions