diff options
| author | Linus Torvalds <[email protected]> | 2019-08-31 01:56:08 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2019-08-31 01:56:08 +0000 |
| commit | e0f14b8ca3882988d15f0b1b853ae3c29d8c9a83 (patch) | |
| tree | 126bf22ac19fbe7ef8b643b38adb440ff8d9be76 /tools/perf/scripts/python/mem-phys-addr.py | |
| parent | Partially revert "kfifo: fix kfifo_alloc() and kfifo_init()" (diff) | |
| parent | crypto: ccp - Ignore unconfigured CCP device on suspend/resume (diff) | |
| download | kernel-e0f14b8ca3882988d15f0b1b853ae3c29d8c9a83.tar.gz kernel-e0f14b8ca3882988d15f0b1b853ae3c29d8c9a83.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"Fix a potential crash in the ccp driver"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ccp - Ignore unconfigured CCP device on suspend/resume
Diffstat (limited to 'tools/perf/scripts/python/mem-phys-addr.py')
0 files changed, 0 insertions, 0 deletions