]> 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: ffd17f8 bd4f7f0)
Merge branch 'upstream'
authorRuss Allbery <rra@debian.org>
Sat, 14 May 2011 17:44:50 +0000 (10:44 -0700)
committerRuss Allbery <rra@debian.org>
Sat, 14 May 2011 17:44:50 +0000 (10:44 -0700)
Conflicts:
acinclude.m4
src/afs/LINUX/osi_compat.h
src/afs/LINUX/osi_misc.c


Trivial merge