From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Mar 2011 01:55:08 +0000 (-0800)
Subject: Merge branches 'perf-fixes-for-linus', 'x86-fixes-for-linus' and 'timers-fixes-for... 
X-Git-Tag: v2.6.38-rc7~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7f233dee2149245bc7ee1194c31a04ea43cd127e;p=linux.git

Merge branches 'perf-fixes-for-linus', 'x86-fixes-for-linus' and 'timers-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 timechart: Fix max number of cpus
  perf timechart: Fix black idle boxes in the title
  perf hists: Print number of samples, not the period sum

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Use u32 instead of long to set reset vector back to 0

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clockevents: Prevent oneshot mode when broadcast device is periodic
---

7f233dee2149245bc7ee1194c31a04ea43cd127e