Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Dec 2008 12:07:48 +0000 (13:07 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 17 Dec 2008 12:07:48 +0000 (13:07 +0100)

Trivial merge