Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2009 19:00:42 +0000 (12:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2009 19:00:42 +0000 (12:00 -0700)
* '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


Trivial merge