Merge branch 'linus' into timers/hpet
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:25:56 +0000 (11:25 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:25:56 +0000 (11:25 +0200)

Trivial merge