diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2019-03-15 15:12:56 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-03-15 15:12:56 +0000 |
commit | 4c2741ac5e103ef2a63a1d4be2c762f52cb3593e (patch) | |
tree | a39ddbc78ed87a1eb1625f552a17f1f94599c9af /drivers/hwtracing | |
parent | d410a8a49e3e00e07d43037e90f776d522b25a6a (diff) | |
parent | 9db043d36bd379f4cc99054c079de0dabfc38d03 (diff) | |
parent | 6213f70e7c10fd4a01b65bad3826648fc78df8a8 (diff) |
Merge branches 'fixes', 'misc' and 'smp-hotplug' into for-next