Merge branch 'linus' into x86/cleanups
authorIngo Molnar <mingo@elte.hu>
Fri, 2 Jan 2009 21:41:36 +0000 (22:41 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 2 Jan 2009 21:41:36 +0000 (22:41 +0100)
Conflicts:
arch/x86/kernel/reboot.c


Trivial merge