tree 0e6929aa585c3d5bf576f214457ab67dd02474f4
parent a4e4b646eb62ca4ce755e2c17aef8f42c8608821
parent 65e31643115349fd7a81acbe75ec4a54d5df8aad
author Linus Torvalds <torvalds@linux-foundation.org> 1244228024 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1244228024 -0700

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ata_piix: Add HP Compaq nc6000 to the broken poweroff list
  ahci: add warning messages for hp laptops with broken suspend
  pata_efar: fix PIO2 underclocking
  pata_legacy: wait for async probing