Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2011 04:20:48 +0000 (21:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2011 04:20:48 +0000 (21:20 -0700)
commit5214638384a968574a5ea3df1d3b3194da32a496
treef0defc396d154c35cd57692c33e7596cd314a93b
parentdf462b3dbeeaae7141f1b63cbfcc1e1bae6a85fc
parent0f61f3e4db71946292ef8d6d6df74b8fcf001646
Merge branch 'perf-urgent-for-linus' of git://git./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()