Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Thu, 18 Dec 2008 10:48:30 +0000 (11:48 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 18 Dec 2008 10:48:30 +0000 (11:48 +0100)

Trivial merge