From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Jun 2009 18:53:44 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.30~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=be94a4ba093c75e06b6fd2b0476f34812fbd359e;p=~emulex%2Finfiniband.git

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
---

be94a4ba093c75e06b6fd2b0476f34812fbd359e