Hi Linus:
This push fixes an NFS regression caused by the skcipher/hash
conversion in sunrpc. It also fixes a build problem in certain
configurations with bcm63xx.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git linus
Herbert Xu (1):
sunrpc: Fix skcipher/shash conversion
Álvaro Fernández Rojas (1):
hwrng: bcm63xx - fix device tree compilation
drivers/char/hw_random/bcm63xx-rng.c | 1 +
net/sunrpc/auth_gss/gss_krb5_crypto.c | 8 ++++++--
net/sunrpc/auth_gss/gss_krb5_mech.c | 3 ++-
3 files changed, 9 insertions(+), 3 deletions(-)
Thanks,
--
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
