Merge branch 'linus' into timers/hpet
authorIngo Molnar <mingo@elte.hu>
Thu, 31 Jul 2008 16:43:41 +0000 (18:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 31 Jul 2008 16:43:41 +0000 (18:43 +0200)

Trivial merge