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

Trivial merge