Merge remote-tracking branch 'coresight/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 05:45:25 +0000 (16:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 8 Feb 2019 05:45:25 +0000 (16:45 +1100)
1  2 
include/linux/perf_event.h

Simple merge