tree 6405c3143fe24a1d5cf028fae3e23e7d38848321
parent f1823acfbcc7d29029d6db757644bc820664af37
parent e9c1670c2a14ef9cc20d86b24b829f3947aad34e
author Linus Torvalds <torvalds@linux-foundation.org> 1237057242 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1237057242 -0700

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:
  ata_piix: add workaround for Samsung DB-P70
  libata: Keep shadow last_ctl up to date during resets
  sata_mv: fix MSI irq race condition