Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Feb 2010 05:12:11 +0000 (21:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Feb 2010 05:12:11 +0000 (21:12 -0800)
commit7491612c7d2cf560bb96dc02bb53d555b41adbb8
treee06601f7996a18732c112729078094671a8d4658
parentbaac35c4155a8aa826c70acee6553368ca5243a2
parent453d3131ec7aab82eaaa8401a50522a337092aa8
Merge branch 'upstream-linus' of git://git./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