From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Jun 2011 03:14:21 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v3.0-rc3~16
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=45694c2895c194ffa74becde4120af6eb6afeefe

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:
  libata: fix unexpectedly frozen port after ata_eh_reset()
---

45694c2895c194ffa74becde4120af6eb6afeefe