Merge branch 'linus' into x86/tracehook
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 15:53:05 +0000 (17:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 15:53:05 +0000 (17:53 +0200)

Trivial merge