Merge branch 'for-linus/pstore' into for-next/pstore
authorKees Cook <keescook@chromium.org>
Tue, 4 Dec 2018 00:52:02 +0000 (16:52 -0800)
committerKees Cook <keescook@chromium.org>
Tue, 4 Dec 2018 00:52:02 +0000 (16:52 -0800)
1  2 
fs/pstore/ram.c

diff --cc fs/pstore/ram.c
Simple merge