From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 31 May 2007 16:07:59 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.22-rc4~73
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc8844ed9b90d348011c31956dd7fef8549efb24;p=linux-2.6

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] Add drive to NCQ blacklist
---

bc8844ed9b90d348011c31956dd7fef8549efb24