From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Mar 2009 17:22:01 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: 2.1b_release~13869
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83d5a325107cd0befa2b863e795675bc8ff881d7;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: Don't trust current capacity values in identify words 57-58
  libata: make sure port is thawed when skipping resets
  sata_nv: fix module parameter description
  ahci: Add the Device IDs for MCP89 and remove IDs of MCP7B to/from ahci.c
  libata: don't use on-stack sense buffer
  libata: align ap->sector_buf
  libata: fix dma_unmap_sg misuse
  libata: change drive ready wait after hard reset to 5s
---

83d5a325107cd0befa2b863e795675bc8ff881d7