Merge branch 'linus' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Tue, 27 Jan 2009 11:01:51 +0000 (12:01 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 27 Jan 2009 11:01:51 +0000 (12:01 +0100)
Conflicts:
arch/x86/kernel/setup_percpu.c


Trivial merge