Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:34:07 +0000 (09:34 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:34:07 +0000 (09:34 +0100)
Conflicts:
arch/x86/kernel/acpi/boot.c


Trivial merge