Merge branch 'linus' into timers/nohz
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 17:53:16 +0000 (19:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 17:53:16 +0000 (19:53 +0200)

Trivial merge