From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 Oct 2008 14:47:57 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.28-rc3~26
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f73aaf10ae14ee8f9644b0f7abe252fe7eeb17f5;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: add whitelist for devices with known good pata-sata bridges
  sata_via: fix support for 5287
  libata: Avoid overflow in ata_tf_to_lba48() when tf->hba_lbal > 127
  ATA: remove excess kernel-doc notation
---

f73aaf10ae14ee8f9644b0f7abe252fe7eeb17f5