summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2018-10-10 13:53:33 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2018-10-10 13:53:33 +0100
commit3e98d240981a33290afc9435d01ec248e5880354 (patch)
tree20433e80c734dd4050c2bb95d497a25d0d462d1d
parent3a58ac65e2d7969bcdf1b6acb70fa4d12a88e53e (diff)
parentf18aef742c8fbd68e280dff0a63ba0ca6ee8ad85 (diff)
parenta1d09e074250fad24f1b993f327b18cc6812eb7a (diff)
downloadlinux-3e98d240981a33290afc9435d01ec248e5880354.tar.bz2
Merge branches 'fixes', 'misc' and 'spectre' into for-next