tree 1adceb5d74b574bb99b67dd0a7456e60f2fbd39f
parent c60ecec67ab3f6b5791ef49d502b7a61909aa13e
parent d8cf5389bd9d1f0ac9fea51796c274ba64b83d80
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1200374768 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1200374768 -0800

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: relocate sdev->manage_start_stop configuration
  sata_sil24: freeze on non-dev errors reported via CERR
  sata_sil24: fix stupid typo
  ata_piix: ignore ATA_DMA_ERR on vmware ich4