Merge branch 'linus' into x86/kprobes
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Jul 2008 11:11:29 +0000 (13:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Jul 2008 11:11:29 +0000 (13:11 +0200)

Trivial merge