Merge branch 'linus' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Thu, 30 Oct 2008 23:38:21 +0000 (00:38 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 30 Oct 2008 23:38:21 +0000 (00:38 +0100)

Trivial merge