diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 16:31:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 16:31:14 -0400 |
| commit | 85ffdd28be04c324349dfc7c9de3d4342c885c3f (patch) | |
| tree | ff89600f2661d7abd5be7802bdb33c9d8d3f1fa4 /include/net/syncppp.h | |
| parent | 43d39ae0cf8f891c35e8316948229c7cbffa3994 (diff) | |
| parent | 77ec15cc265af2c165b7e39cadcaddb9e64aac3d (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] pata_pcmcia: Add additional id string (corsair, 1GB)
libata: prevent devices with blank model names from being DMA blacklisted
ata_piix: SATA 2port controller port map fix
pata_cs5536: ATA driver for Geode companion chip
libata: add ST9160821AS / 3.CCD to NCQ blacklist
libata: fix revalidation issuing after configuration commands
[libata] sata_nv: add SW NCQ support for MCP51/MCP55/MCP61
[libata] pata_sil680: Add MMIO support
Diffstat (limited to 'include/net/syncppp.h')
0 files changed, 0 insertions, 0 deletions