commit 7f233dee2149245bc7ee1194c31a04ea43cd127e
author Linus Torvalds <torvalds@linux-foundation.org> Mon Feb 28 17:55:08 2011 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Feb 28 17:55:08 2011 -0800
tree 84cf63b826aad6cb3c849a3368ede15d4473b51b
parent 58da94f0139d848884ec4827593f1082276bbbf8
parent 54b08f5f90feebc9756d96e0c7bf2fdffe4af7c3
parent 299c56966a72b9109d47c71a6db52097098703dd
parent 3a142a0672b48a853f00af61f184c7341ac9c99d

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