tree 19bcfb24591071bd44d3fc718e85d1558b3f686a
parent d2a145252c52792bc59e4767b486b26c430af4bb
parent ae2aae2421983f6f68eb7c4692624bc43ea50712
author James Bottomley <James.Bottomley@HansenPartnership.com> 1482438753 -0800
committer James Bottomley <James.Bottomley@HansenPartnership.com> 1482438753 -0800

Merge branch 'misc' into for-linus