From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Apr 2008 22:19:09 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.26-rc1~350
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c65a3500b2947d344862da8cce626b7cc7ec5758;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:
  [libata] linux/libata.h: reorganize ata_device struct members a bit
  ahci: SB600 ahci can't do MSI, blacklist that capability
  libata: More TSSTcorp pain, keep in sync with legacy IDE
  pata_via: Fix 6410 misdetect
  [libata] pata_atiixp: fix PIO timing data misprogramming
---

c65a3500b2947d344862da8cce626b7cc7ec5758