]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc01637 7b4f6ec)
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)
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


Trivial merge
Andy's Linux Kernel repo