Merge branch 'linus' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Wed, 11 Mar 2009 09:29:28 +0000 (10:29 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 11 Mar 2009 09:29:28 +0000 (10:29 +0100)
Conflicts:
arch/x86/include/asm/fixmap_64.h


Trivial merge