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)
commit78bbd284e85f1af56a9fa30760c019357c2a1b4b
tree3e1d397a35d416e9c3d809f3dc8d9a8bac346af3
parenteab8bcb67a6f4e8d428b76c894a447229812c8ac
parent2b022a82a01737012155b5ba462db74232ff1f2e
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