From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Jan 2010 15:42:59 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.33-rc5~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=836f48c5f8c6ef004419f1605514aa05eb58eefb;p=profile%2Fivi%2Fkernel-x86-ivi.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:
  libata: retry FS IOs even if it has failed with AC_ERR_INVALID
---

836f48c5f8c6ef004419f1605514aa05eb58eefb