Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 31 May 2007 16:07:59 +0000 (09:07 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 31 May 2007 16:07:59 +0000 (09:07 -0700)
commitbc8844ed9b90d348011c31956dd7fef8549efb24
tree8ac56dd113348761c44ae5a635f70d5e907f5b38
parent12d810c1b8c2b913d48e629e2b5c01d105029839
parent471e44b26ef84658ee434087413c445bbe14686b
Merge branch 'upstream-linus' of /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