OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-967-g3f3d0d9

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 3f3d0d999f1c6ab25271418c302a79e3e5661f10
Author: Jeffrey Altman <jaltman@your-file-system.com>
Date:   Mon Mar 28 08:29:25 2011 -0400

    vol: remove flock emulation now provided by roken
    
    flock emulation is provided by rk_flock from roken.   No need
    to provide a local emulation function in namei_ops.c.
    
    This change removes a macro redefinition warning.
    
    Change-Id: Id8b7cf030d8653ceb979db60c20ed28c03bd9737
    Reviewed-on: http://gerrit.openafs.org/4365
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

 src/vol/namei_ops.c |   25 -------------------------
 1 files changed, 0 insertions(+), 25 deletions(-)

-- 
OpenAFS Master Repository