Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Sun, 14 Dec 2008 20:58:33 +0000 (21:58 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 14 Dec 2008 20:58:33 +0000 (21:58 +0100)

Trivial merge