Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 15:42:59 +0000 (07:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 15:42:59 +0000 (07:42 -0800)
commit836f48c5f8c6ef004419f1605514aa05eb58eefb
treeca9d806077e709252c0f33532a55595275b11637
parentbdeef61cd053b6a88be7d2c82fd43e12f8c9f75e
parent534ead709235b967b659947c55d9130873a432c4
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