From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Nov 2008 17:21:28 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.28-rc5~88
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=5da38d32824eb27c325d296bf3a39b5946578789;p=~andy%2Flinux

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: fix last_reset timestamp handling
  libata: Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
  [libata] pata_pcmcia: another memory card support
  [libata] pata_sch: notice attached slave devices
  [libata] pata_cs553*.c: cleanup kernel-doc
---

5da38d32824eb27c325d296bf3a39b5946578789