Merge branch 'perf-tools-for-linus' of git://github.com/acmel/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 22:17:02 +0000 (15:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 22:17:02 +0000 (15:17 -0700)
* 'perf-tools-for-linus' of git://github.com/acmel/linux:
  perf python: Add missing perf_event__parse_sample 'swapped' parm


Trivial merge