From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 3 Jul 2007 04:04:36 +0000 (-0700)
Subject: Merge branch 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.22~46
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1fa238762ad2518ab6003983c16508470be6d81;p=linux-2.6

Merge branch 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] sata_nv: undo merge error
---

c1fa238762ad2518ab6003983c16508470be6d81