tree f0defc396d154c35cd57692c33e7596cd314a93b
parent df462b3dbeeaae7141f1b63cbfcc1e1bae6a85fc
parent 0f61f3e4db71946292ef8d6d6df74b8fcf001646
author Linus Torvalds <torvalds@linux-foundation.org> 1306210848 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306210848 -0700

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()