tree 1fd355ab8273cf6d3cc4d7f744370a8e8969a0a5
parent 3ccfc65c5004e5fe5cfbffe43b8acc686680b53e
parent 732f74a46711c0724885703fb689c79139c84a3c
author Linus Torvalds <torvalds@g5.osdl.org> 1162437391 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1162437391 -0800

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  Revert "[PATCH] Add 0x7110 piix to ata_piix.c"
  [libata] sata_nv: Add PCI IDs
  [PATCH] ahci: fix status register check in ahci_softreset