tree 844b0cf730b7412c4c678037d628cf61597d8478
parent 4db43e677ec2dcfb6129d5e557ed4795f9e4a031
parent 7acfaf3037ff19b749117a286f0f24e201ada0ec
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1175114760 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1175114760 -0700

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