Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...
authorIngo Molnar <mingo@elte.hu>
Tue, 11 Nov 2008 20:34:07 +0000 (21:34 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 11 Nov 2008 20:34:07 +0000 (21:34 +0100)

Trivial merge