Merge branch 'linus' into x86/timers
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:36:55 +0000 (12:36 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:36:55 +0000 (12:36 +0200)

Trivial merge