]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
projects / packages / o / openafs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cde58b 1949585)
Merge branch 'upstream' into bug/ucontext-everywhere
authorRuss Allbery <rra@debian.org>
Thu, 12 Feb 2009 18:38:42 +0000 (10:38 -0800)
committerRuss Allbery <rra@debian.org>
Thu, 12 Feb 2009 18:38:42 +0000 (10:38 -0800)
Conflicts:

src/config/param.alpha_linux_26.h


Trivial merge