Merge branch 'linus' into timers/ntp
authorIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 13:31:03 +0000 (15:31 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 13:31:03 +0000 (15:31 +0200)

Trivial merge