Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Tue, 16 Dec 2008 11:24:26 +0000 (12:24 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 16 Dec 2008 11:24:30 +0000 (12:24 +0100)

Trivial merge