]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b82e800 0737ac8)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 28 May 2006 23:35:52 +0000 (16:35 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 28 May 2006 23:35:52 +0000 (16:35 -0700)
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] the latest consensus libata resume fix


Trivial merge
Linux 2.6 source tree