From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Jul 2009 19:29:39 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.31-rc5~68
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2e13e5f03538cfded0c463fd60eddd0c8e2cd959;p=~shefty%2Frdma-dev.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:
  libata: accept late unlocking of HPA
  libata: Updates and fixes for pata_at91 driver
  ata_piix: Add new short cable ID
  ata_piix: Add new laptop short cable IDs
  ahci: add device IDs for Ibex Peak ahci controllers
  libata: remove superfluous NULL pointer checks
  libata: add missing NULL pointer check to ata_eh_reset()
  pata_pcmcia: add CNF-CDROM-ID
---

2e13e5f03538cfded0c463fd60eddd0c8e2cd959