Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jun 2010 17:15:37 +0000 (19:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jun 2010 17:15:37 +0000 (19:15 +0200)

Trivial merge