]> git.michaelhowe.org Git - packages/o/openafs.git/commit
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)
commitf5e3a0cca3ebcb3b577a21f21e5ea95626a68ab6
tree886809b3445f43f13510b62a1aeca6127216f689
parentffd17f84d01745a94d2c6f1d73e968dd7c34863e
parentbd4f7f08c908a9b94d42c25e648706bc1eb307b6
Merge branch 'upstream'

Conflicts:
acinclude.m4
src/afs/LINUX/osi_compat.h
src/afs/LINUX/osi_misc.c