diff options
author | 2015-03-09 17:45:34 -0700 | |
---|---|---|
committer | 2015-03-09 17:45:34 -0700 | |
commit | eca8dac4fa477cb26eb6478f4a5d2cf381128753 (patch) | |
tree | 15a9f2b15492da1f81846d09b8a85a24f84a764d /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge tag 'fbdev-fixes-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux (diff) | |
parent | Merge branch 'for-current' of https://github.com/PeterHuewe/linux-tpmdd into for-linus (diff) | |
download | linux-dev-eca8dac4fa477cb26eb6478f4a5d2cf381128753.tar.xz linux-dev-eca8dac4fa477cb26eb6478f4a5d2cf381128753.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull tpm fixes from James Morris:
"fixes for the TPM driver"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
tpm: fix call order in tpm-chip.c
tpm/ibmvtpm: Additional LE support for tpm_ibmvtpm_send
Diffstat (limited to 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions