]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Feb 2011 20:04:16 +0000 (12:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Feb 2011 20:04:16 +0000 (12:04 -0800)
commit15ccb7b429d341605296b6a654b414f2b3ae9fd3
treef2af4a8952b10728e13c6f41db4b7a062a574a5c
parent07675f484bb9de0c4bd0722e174cb27043dbacef
parent862b6f62bf0cd768910b087f6d051f420206c4d6
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf stat: Fix aggreate counter reading accounting
  tracing: Replace syscall_meta_data struct array with pointer array
  tracepoints: Fix section alignment using pointer array
  tracing: Replace trace_event struct array with pointer array