diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 22:01:36 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-08 22:01:36 (GMT) |
| commit | a419df8a0ff01b6694cebc8885778f854165d17d (patch) | |
| tree | 240f4b0a5af19207080da8e09bb6aacc42a8575a /drivers/net/slip.c | |
| parent | 33b04b9308959af7febc1c111c766fa3fd8b1934 (diff) | |
| parent | 0fe40ff891faa940e539bd5a92c4a5dd9ae49b0b (diff) | |
| download | linux-fsl-qoriq-a419df8a0ff01b6694cebc8885778f854165d17d.tar.xz | |
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: clean up the SFF code for coding style
libata: Add 32bit PIO support
[libata] ahci: Withdraw IGN_SERR_INTERNAL for SB800 SATA
pata_hpt366: reimplement mode programming
[libata] pata_hpt3x3: correct _freeze() function declaration
libata: Add special ata_pio_need_iordy() handling for Compact Flash.
pata_platform: __pata_platform_remove() shouldn't be in discard section
sata_sil24: remove unused sil24_port_multiplier
[libata] ahci: Add SATA GEN3 related messages
ata_piix: save, use saved and restore IOCFG
pata_ali: Fix and workaround for FIFO DMA bug
pata_ali: force initialise a few bits
pata_hpt3x3: Workarounds for chipset
Diffstat (limited to 'drivers/net/slip.c')
0 files changed, 0 insertions, 0 deletions