diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 12:51:28 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-31 12:51:28 +1000 |
| commit | f9a3d1d74bdacf8a5ef8025233e61546cb809dc8 (patch) | |
| tree | 722c80597d16cfab200cbd186bb08a88942a3606 /arch/x86/include/asm | |
| parent | ef9f2fa17f3d6973a479a7677a023ee3604a52cb (diff) | |
| parent | 729a6a300e628a48cf12bac93a964a535e83cd1d (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:
libata: set queue DMA alignment to sector size for ATAPI too
libata: DVR-212D can't do SETXFER DVD-RW DVR-212D
ahci: add HFLAG_YES_FBS and apply it to 88SE9128
pata_hpt37x: inherit prereset() method for HPT374
ahci: AHCI mode SATA patch for Intel DH89xxCC DeviceIDs
pata_hpt37x: fold 'if' statement into 'switch'
pata_hpt{37x|3x2n}: use pr_*(DRV_NAME ...) instead of printk(KERN_* ...)
pata_hpt{366|37x}: use pr_warning(...) instead of printk(KERN_WARNING ...)
pata_mpc52xx: inherit from ata_bmdma_port_ops
Diffstat (limited to 'arch/x86/include/asm')
0 files changed, 0 insertions, 0 deletions