tree 9287488d77cfd3fc776bc2feb4ce1cf8dff36471
parent d6d61c97e69ca0e8471804603cf00d8abf2fa12d
parent f4929bd37208540c2c6f416e9035ff1938f2dbc6
author Linus Torvalds <torvalds@linux-foundation.org> 1303497087 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1303497087 -0700

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