diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-30 18:56:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-30 18:56:08 -0700 |
| commit | e0f14b8ca3882988d15f0b1b853ae3c29d8c9a83 (patch) | |
| tree | 126bf22ac19fbe7ef8b643b38adb440ff8d9be76 /mm/compaction.c | |
| parent | ab9bb6318b0967671e0c9b6537c1537d51ca4f45 (diff) | |
| parent | 5871cd93692c8071fb9358daccb715b5081316ac (diff) | |
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 'mm/compaction.c')
0 files changed, 0 insertions, 0 deletions