From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Sep 2011 22:17:02 +0000 (-0700)
Subject: Merge branch 'perf-tools-for-linus' of git://github.com/acmel/linux
X-Git-Tag: v3.1-rc8~14
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=78bbd284e85f1af56a9fa30760c019357c2a1b4b;p=linux.git

Merge branch 'perf-tools-for-linus' of git://github.com/acmel/linux

* 'perf-tools-for-linus' of git://github.com/acmel/linux:
  perf python: Add missing perf_event__parse_sample 'swapped' parm
---

78bbd284e85f1af56a9fa30760c019357c2a1b4b