| commit | 7491612c7d2cf560bb96dc02bb53d555b41adbb8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 24 21:12:11 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 24 21:12:11 2010 -0800 |
| tree | e06601f7996a18732c112729078094671a8d4658 | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 [diff] | |
| parent | 453d3131ec7aab82eaaa8401a50522a337092aa8 [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: ahci: disable FPDMA auto-activate optimization on NVIDIA AHCI