Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 08:04:32 +0000 (09:04 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 6 Jan 2009 08:04:32 +0000 (09:04 +0100)

Trivial merge