tree c2e6387d8eae211f32575a2d58427129d7bb8317
parent e30408b2a99cb7b8bf529c7dc2328a19d71894cf
parent 6c08772e49622e90d39903e7ff0be1a0f463ac86
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192164440 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192164440 -0700

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

* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] sata_mv: more S/G fixes