summaryrefslogtreecommitdiff
path: root/drivers/hwtracing
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2019-03-15 15:12:56 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2019-03-15 15:12:56 +0000
commit4c2741ac5e103ef2a63a1d4be2c762f52cb3593e (patch)
treea39ddbc78ed87a1eb1625f552a17f1f94599c9af /drivers/hwtracing
parentd410a8a49e3e00e07d43037e90f776d522b25a6a (diff)
parent9db043d36bd379f4cc99054c079de0dabfc38d03 (diff)
parent6213f70e7c10fd4a01b65bad3826648fc78df8a8 (diff)
Merge branches 'fixes', 'misc' and 'smp-hotplug' into for-next