From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jun 2008 14:40:57 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v3.12-rc1~20338
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa8d84b78be10d0c455dd716f40152bb7003bd5b;p=kernel%2Fkernel-generic.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: Workaround HW bug for SB600/700 SATA controller PMP support
  ahci: workarounds for mcp65
---

fa8d84b78be10d0c455dd716f40152bb7003bd5b