From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 May 2009 19:04:37 +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~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8c21f34126222239450717b78dda0c4962d9ebfa;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 ssh://master.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: Media rotation rate and form factor heuristics
  libata: Report disk alignment and physical block size
  sata_fsl: Fix the command description of FSL SATA controller
  sata_fsl: Fix compile warnings
  [libata] sata_sx4: fixup interrupt handling
  [libata] sata_sx4: convert to new exception handling methods
---

8c21f34126222239450717b78dda0c4962d9ebfa