diff options
author | 2012-08-23 21:58:04 -0700 | |
---|---|---|
committer | 2012-08-23 21:58:04 -0700 | |
commit | 2d809dcd88f590d68dd741dc4d28a84128449fbd (patch) | |
tree | e00daba2e854f2646914f370157034db5dea071c /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs (diff) | |
parent | crypto: caam - fix possible deadlock condition (diff) | |
download | linux-dev-2d809dcd88f590d68dd741dc4d28a84128449fbd.tar.xz linux-dev-2d809dcd88f590d68dd741dc4d28a84128449fbd.zip |
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 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions