From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 12 Jun 2006 14:47:04 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.17~23
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0e838b72d54ed189033939258a961f2a0cd59647;p=linux-2.6-omap-h63xx.git

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
---

0e838b72d54ed189033939258a961f2a0cd59647