From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 28 Mar 2007 20:46:00 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.21-rc6~79
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2ba302c633754520c990a8c1d161ff304eda6002;p=linux-2.6-omap-h63xx.git

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:
  ata: NCQ is broken on Maxtor 6L250S0
  pata_pdc202xx_old: LBA48 bug
  libata: IDENTIFY backwards for drive side cable detection
  ahci.c: walkaround for SB600 SATA internal error issue
  [libata] Disable ACPI by default; fix namespace problems
---

2ba302c633754520c990a8c1d161ff304eda6002