diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2018-06-05 10:03:27 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2018-06-05 10:03:27 +0100 |
| commit | 0ac000e86703dedea1000513dbb8a64d02930668 (patch) | |
| tree | c21658c704c9dcdcb2dc18863ab60312885a6b90 | |
| parent | 92d44a42af81e850a038c38278ff4f434b2871df (diff) | |
| parent | 83d41fb9c0eb66b3a97968cbe836e8c4df6af8ec (diff) | |
| parent | 10573ae547c85b2c61417ff1a106cffbfceada35 (diff) | |
Merge branches 'fixes', 'misc' and 'spectre' into for-linus