From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 17 May 2007 04:28:49 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v3.12-rc1~29496
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2cd64153b94473f6bd82448a68b8e8c041676ea;p=kernel%2Fkernel-generic.git

Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: track spindown status and skip spindown_compat if possible
  libata: fix shutdown warning message printing
  libata-acpi: add ATA_FLAG_ACPI_SATA port flag
  libata: during revalidation, check n_sectors after device is configured
  libata: separate out ata_dev_reread_id()
  pata_scc had been missed by ata_std_prereset() switch
---

b2cd64153b94473f6bd82448a68b8e8c041676ea