From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 May 2009 19:42:55 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.30-rc6~38
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7b5ca22643beba8fdd5b7055e0594a514b3710d7;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: The Sony TZ90 needs the cable type hardcoding
  ata_piix: ICH7 does not support correct MWDMA timings
  Avoid world-writable sysfs files in libata driver.
  libata: fix suspend/resume for ATA SEMB devices
  libata: clear ering on resume
  pata_pdc202xx_old: fix UDMA33 handling
  sata_mv: use new sata phy register settings for new devices
  libata: fix attach error handling
---

7b5ca22643beba8fdd5b7055e0594a514b3710d7