From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2011 04:20:48 +0000 (-0700)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0-rc1~321
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5214638384a968574a5ea3df1d3b3194da32a496;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools: Fix sample type size calculation in 32 bits archs
  profile: Use vzalloc() rather than vmalloc() & memset()
---

5214638384a968574a5ea3df1d3b3194da32a496