projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 609b06f 4fe757d)
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Feb 2011 17:25:55 +0000 (09:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Feb 2011 17:25:55 +0000 (09:25 -0800)
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Fix throttle logic
  perf, x86: P4 PMU: Fix spurious NMI messages


Trivial merge
Domain: System / Kernel;