From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Oct 2008 15:15:29 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.28-rc1~62
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dc8dcad83b53e3aebc52889e81772c00a1490408;p=linux-2.6-omap-h63xx.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:
  sata_via: load DEVICE register when CTL changes
  libata: set device class to NONE if phys_offline
  libata-eh: fix slave link EH action mask handling
  libata: transfer EHI control flags to slave ehc.i
  libata-sff: fix ata_sff_post_internal_cmd()
  libata: initialize port_task when !CONFIG_ATA_SFF
---

dc8dcad83b53e3aebc52889e81772c00a1490408