diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-22 11:31:27 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-22 11:31:27 -0700 |
commit | 258ba6a5a9194ea043850f77d1219053c810e043 (patch) | |
tree | 9287488d77cfd3fc776bc2feb4ce1cf8dff36471 /Makefile | |
parent | d6d61c97e69ca0e8471804603cf00d8abf2fa12d (diff) | |
parent | f4929bd37208540c2c6f416e9035ff1938f2dbc6 (diff) |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf, x86: Update/fix Intel Nehalem cache events
perf, x86: P4 PMU - Don't forget to clear cpuc->active_mask on overflow
x86, perf event: Turn off unstructured raw event access to offcore registers
perf: Support Xeon E7's via the Westmere PMU driver
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions