summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/parse-events.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-31 15:33:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-31 15:33:04 -0700
commitec7a19bfec544aa73e347369232f9bd654954aa3 (patch)
treeecb7317f9941f3a3976f38883bdd9df6e4f1c8f7 /tools/perf/util/parse-events.c
parent26847fa6eb4fd653171f86d249caa761ce1e87c7 (diff)
parentad36cb0d1d3e2b7f161cd33932433f9349cade1e (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc updates from Benjamin Herrenschmidt: "Kumar sent me a handful of Freescale related fixes and I added another regression fix to the pile. PS. I -will- eventually learn about that signed tag business :-)" * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/kvm/book3s_32: Fix MTMSR_EERI macro powerpc/85xx: p1022ds: fix DIU/LBC switching with NAND enabled powerpc/85xx: p1022ds: disable the NAND flash node if video is enabled powerpc/85xx: Fix sram_offset parameter type powerpc/85xx: P3041DS - change espi input-clock from 40MHz to 35MHz powerpc/85xx: Fix pci base address error for p2020rdb-pc in dts
Diffstat (limited to 'tools/perf/util/parse-events.c')
0 files changed, 0 insertions, 0 deletions