Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Jun 2006 14:47:04 +0000 (07:47 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Jun 2006 14:47:04 +0000 (07:47 -0700)
commit0e838b72d54ed189033939258a961f2a0cd59647
tree461db801b2188e43f871c15804ea6d04d08f8327
parent289a1e995e74734b5ec76ca8a5490058f4fecc24
parent2f9719b61e1fcf7422a016ac4f2420a0cc6ba320
Merge branch 'upstream-linus' of /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