From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Apr 2009 21:42:04 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v3.0~9488
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c19f83669a02d4fa047d0d40f518e90f6f19c4c6;p=platform%2Fkernel%2Flinux-amlogic.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:
  ata: Report 16/32bit PIO as best we can
  libata: use ATA_ID_CFA_*
  pata_legacy: fix no device fail path
  pata_hpt37x: fix HPT370 DMA timeouts
  libata: handle SEMB signature better
---

c19f83669a02d4fa047d0d40f518e90f6f19c4c6