tree 4397d83610ebf2a41a61a4466b0572dcebbf806d
parent d022bafbb66a2662edaee5bf38bf0f70a755dcd0
parent 16e6aeca9e86fb0effb847c1687c9b2cc8e3fb4c
author Linus Torvalds <torvalds@linux-foundation.org> 1240010429 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1240010429 -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:
  [libata] fix build error on drivers/ata/pata_legacy.c
  pata_via: Cache and rewrite the device bit
  sata_mv: workaround for multi_count errata sata24
  sata_mv: tidy up qc->tf usage in qc_prep() functions