From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Feb 2011 16:52:05 +0000 (-0800)
Subject: Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.38-rc4~25
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=eb487ab4d5af0caee81bfaaa5d87b55844f60145;p=~shefty%2Frdma-dev.git

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: Fix reading in perf_event_read()
  watchdog: Don't change watchdog state on read of sysctl
  watchdog: Fix sysctl consistency
  watchdog: Fix broken nowatchdog logic
  perf: Fix Pentium4 raw event validation
  perf: Fix alloc_callchain_buffers()
---

eb487ab4d5af0caee81bfaaa5d87b55844f60145