Merge branch 'linus' into timers/hpet
authorIngo Molnar <mingo@elte.hu>
Sun, 22 Feb 2009 16:59:49 +0000 (17:59 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 22 Feb 2009 16:59:49 +0000 (17:59 +0100)

Trivial merge