summaryrefslogtreecommitdiff
path: root/crypto/fcrypt.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-20 18:05:29 (GMT)
committerOlof Johansson <olof@lixom.net>2011-12-20 18:05:29 (GMT)
commit2123b16bb6275b8b3de27a1ae0962ed31b44bcf1 (patch)
tree6cfe486d1941c2d85609cbbb6657944d963e9edb /crypto/fcrypt.c
parent4b3ee30b5201ddeefdc56ad32b6bbc1fab8b084a (diff)
parent1095843489f7a805106dc0cc39187d5df960d11a (diff)
downloadlinux-2123b16bb6275b8b3de27a1ae0962ed31b44bcf1.tar.xz
Merge branch 'ux500/devel' into next/devel
* ux500/devel: ARM: ux500: fix the smp_twd clock calculation ARM: ux500: remove support for early silicon revisions ARM: ux500: update register files ARM: ux500: register DB5500 PMU dynamically ARM: ux500: update ASIC detection for U5500 ARM: ux500: support DB8520
Diffstat (limited to 'crypto/fcrypt.c')
0 files changed, 0 insertions, 0 deletions