From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Sep 2009 03:54:49 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.32-rc1~655
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ca9a702e50287cf429f1c12832319a26a715e70b;p=users%2Fjedix%2Flinux-maple.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 pata_atp867x driver for Artop/Acard ATP867X controllers
  pata_amd: do not filter out valid modes in nv_mode_filter
  sata_promise: update reset code
  sata_promise: disable hotplug on 1st gen chips
  libata: fix spurious WARN_ON_ONCE() on port freeze
  ahci: restore pci_intx() handling
---

ca9a702e50287cf429f1c12832319a26a715e70b