From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Feb 2009 22:16:02 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.29-rc6~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0637810f24bad641d3d3f80fd3f63f3baffd9536;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:
  sata_nv: give up hardreset on nf2
  libata-sff: fix 32-bit PIO ATAPI regression
---

0637810f24bad641d3d3f80fd3f63f3baffd9536