diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-11 20:42:11 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-11 20:42:11 -0800 |
commit | a17b7a398d5c20ccbcb11f98dc2a76a6f07934ad (patch) | |
tree | 8c044501818c13b35bdc45ac5bf3189bfd556deb /include/asm-m32r | |
parent | 271cad6d7e91ff8eea18976311692f99cd667ad3 (diff) | |
parent | fbf14e2f2d674e6a2ff0fb2aa569e7f6687483a3 (diff) |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
sata_mv: platform driver allocs dma without create
pata_ninja32: setup changes
pata_legacy: typo fix
pata_amd: Note in the module description it handles Nvidia
sata_mv: fix loop with last port
libata: ignore deverr on SETXFER if mode is configured
pata_via: fix SATA cable detection on cx700
Diffstat (limited to 'include/asm-m32r')
0 files changed, 0 insertions, 0 deletions