Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Sep 2012 11:07:15 +0000 (19:07 +0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Sep 2012 11:07:15 +0000 (19:07 +0800)
commit5e88083f40b38a5382f590475be4607f7cdb30df
tree05a5a203c93bc84e71309b1fc91ec15693a9cd93
parentbc01637a80f5b670bd70a0279d3f93fa8de1c96d
parent7b4f6ecacb14f384adc1a5a67ad95eb082c02bd1
Merge tag 'upstream-linus' of git://git./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