diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-12-22 12:32:33 -0800 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-12-22 12:32:33 -0800 |
commit | 3eff4c782857d284dc3b11c6db0cab4a263427b7 (patch) | |
tree | 19bcfb24591071bd44d3fc718e85d1558b3f686a | |
parent | d2a145252c52792bc59e4767b486b26c430af4bb (diff) | |
parent | ae2aae2421983f6f68eb7c4692624bc43ea50712 (diff) |
Merge branch 'misc' into for-linus