Merge branch 'perf/uncore-json-updates-1' of git://git.kernel.org/pub/scm/linux/kerne...

Merge branch 'perf/uncore-json-updates-1' of git://git./linux/kernel/git/ak/linux-misc into perf/core

Pull perf/core improvements from Andi Kleen:

This pull requests contains updates to the Intel PMU events JSON files,
plus two one liner code fixes for the JSON files (also appended as patch)

The most remarkable change is support for Sandy Bridge to Skylake
client uncore event list support.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>