OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-864-gf6f8158

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit f6f8158ada81a50961699de68f6f2348fcc4a955
Author: Simon Wilkinson <sxw@your-file-system.com>
Date:   Mon Mar 7 17:23:51 2011 +0000

    crypto: Add krb5_crypto_fx_cf2 to our prototypes
    
    Admit to having the krb5_crypto_fx_cf2 function in the kernel RFC3961
    implementation - we're going to use it for for key combining
    
    Change-Id: Ibb11a4d7467bc18eb222d5f8902dc4181b30e92c
    Reviewed-on: http://gerrit.openafs.org/4204
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/crypto/rfc3961/rfc3961.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

-- 
OpenAFS Master Repository