From: Linus Torvalds Date: Thu, 25 Feb 2010 05:12:11 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7491612c7d2cf560bb96dc02bb53d555b41adbb8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- 7491612c7d2cf560bb96dc02bb53d555b41adbb8