diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 08:14:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 08:14:45 -0800 |
| commit | d894f4510d2155f9136c8c1bb91912481329f6e0 (patch) | |
| tree | 442f30ec38d6cf9e7621f08f5a4f443037594815 /include/linux/telephony.h | |
| parent | 4200b66cbf6f4970dd7e192cc929cbccae12a4ca (diff) | |
| parent | 02a121da5a53d415b6596bc19cc6999d295d32a4 (diff) | |
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:
sata_mv: Fix broken Marvell 7042 support.
libata: Fix early use of port printk. (Was Re: ata4294967295: failed to start port (errno=-19))
ata_piix: add more toshiba laptops to broken suspend list
libata: More IVB horkage from TSST
libata: report protocol and full CDB on error
Several fixes for the AVR32 PATA driver
sata_mv: fix compilation error when enabling DEBUG
Set proper ATA UDMA mode for bf548 according to system clock.
Diffstat (limited to 'include/linux/telephony.h')
0 files changed, 0 insertions, 0 deletions