From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Oct 2008 16:42:48 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.28-rc3~93
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3c136f29ba5ae8dfcae4958bbcb581420b43a74d;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: ahci enclosure management bit mask
  libata: ahci enclosure management led sync
  pata_ninja32: suspend/resume support
  libata: Fix LBA48 on pata_it821x RAID volumes.
  libata: clear saved xfer_mode and ncq_enabled on device detach
  sata_sil24: configure max read request size to 4k
  libata: add missing kernel-doc
  libata: fix device iteration bugs
  ahci: Add support for Promise PDC42819
  ata: Switch all my stuff to a common address
---

3c136f29ba5ae8dfcae4958bbcb581420b43a74d