Merge branch 'linus' into cpumask-for-linus
authorIngo Molnar <mingo@elte.hu>
Mon, 30 Mar 2009 21:53:32 +0000 (23:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 30 Mar 2009 21:53:32 +0000 (23:53 +0200)
Conflicts:
arch/x86/kernel/cpu/common.c


Trivial merge