]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 289a1e9 2f9719b)
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)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] sata_mv: grab host lock inside eng_timeout


Trivial merge
Linux 2.6 source tree