Merge branch 'linus' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:11:42 +0000 (11:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:11:42 +0000 (11:11 +0200)

Trivial merge