]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Thu, 19 May 2011 17:48:03 +0000 (19:48 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 19 May 2011 17:48:03 +0000 (19:48 +0200)

Trivial merge