tree 461db801b2188e43f871c15804ea6d04d08f8327
parent 289a1e995e74734b5ec76ca8a5490058f4fecc24
parent 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320
author Linus Torvalds <torvalds@g5.osdl.org> 1150123624 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1150123624 -0700

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] sata_mv: grab host lock inside eng_timeout