From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Jul 2008 18:37:55 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.26~19
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4d727a781f6c9ab8b446d6596ed2dcd6ce80bb47;p=~shefty%2Frdma-dev.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-acpi: don't call sleeping function from invalid context
  Added Targa Visionary 1000 IDE adapter to pata_sis.c
  libata-acpi: filter out DIPM enable
---

4d727a781f6c9ab8b446d6596ed2dcd6ce80bb47