Merge commit 'v2.6.27-rc8' into oprofile
authorIngo Molnar <mingo@elte.hu>
Tue, 30 Sep 2008 10:16:26 +0000 (12:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 30 Sep 2008 10:16:26 +0000 (12:16 +0200)
Conflicts:
arch/x86/oprofile/nmi_int.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge