Merge tag 'v4.7' into for-linus/pstore
authorKees Cook <keescook@chromium.org>
Mon, 25 Jul 2016 20:50:36 +0000 (13:50 -0700)
committerKees Cook <keescook@chromium.org>
Mon, 25 Jul 2016 20:50:36 +0000 (13:50 -0700)
Linux 4.7


Trivial merge