From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Sep 2012 11:07:15 +0000 (+0800)
Subject: Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v3.6-rc6~26
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5e88083f40b38a5382f590475be4607f7cdb30df;p=linux.git

Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Pull additional AHCI PCI IDs from Jeff Garzik.

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ahci: Add identifiers for ASM106x devices
  ahci: Add alternate identifier for the 88SE9172
  ahci: Add JMicron 362 device IDs
---

5e88083f40b38a5382f590475be4607f7cdb30df