OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-845-g81487fc

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 81487fcf3ae93d2efea6f0935a0493680b5d3d11
Author: Derrick Brashear <shadow@dementia.org>
Date:   Mon Mar 7 21:32:53 2011 -0500

    hcrypto: avoid key_type redefinition
    
    struct key_type is redefined in crypto.h; originally defined in
    ./linux/security.h from ../afs/sysincludes.h from hcrypto/kernel/config.h
    
    Change-Id: Ib2a4244516c6c0947cb0959bdf9b06fb5a023a28
    Reviewed-on: http://gerrit.openafs.org/4178
    Tested-by: Derrick Brashear <shadow@dementia.org>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/crypto/hcrypto/kernel/config.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

-- 
OpenAFS Master Repository