diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-24 04:58:04 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-24 04:58:04 (GMT) |
| commit | 2d809dcd88f590d68dd741dc4d28a84128449fbd (patch) | |
| tree | e00daba2e854f2646914f370157034db5dea071c /fs/nls/mac-roman.c | |
| parent | 62688e5b6465395c093b91bd4c29794758eb24fe (diff) | |
| parent | ce026cb9cbf1d529652394ea91fb8a459072be91 (diff) | |
| download | linux-fsl-qoriq-2d809dcd88f590d68dd741dc4d28a84128449fbd.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes a build error on 32-bit archs in the hifn driver as
well as a potential deadlock in the caam driver."
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: caam - fix possible deadlock condition
crypto: hifn_795x - fix 64bit division and undefined __divdi3 on 32bit archs
Diffstat (limited to 'fs/nls/mac-roman.c')
0 files changed, 0 insertions, 0 deletions