From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Jan 2013 18:10:34 +0000 (-0800)
Subject: Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v3.8-rc5~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0944c0a03465718909ba8e800a5230528aeabafb;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge tag 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

Pull libata fixes from Jeff Garzik:

 1) ahci: Fix typo that caused erronenous error handling.

    Thought: I wonder if sparse could have caught this, somehow.

 2) ahci: support a slightly odd Enmotus variant

 3) core: fix a drive detection problem by correcting the logic by which
    the DevSlp timing variables are obtained and used.

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] replace sata_settings with devslp_timing
  [libata] ahci: Add support for Enmotus Bobcat device.
  [libata] ahci: Fix lack of command retry after a success error handler.
---

0944c0a03465718909ba8e800a5230528aeabafb