tree c3f168427372e64f7467a794f313416da5086ba0
parent 103ceffb9501531f6931df6aebc11a05189201f0
parent b840d79631c882786925303c2b0f4fefc31845ed
author Ingo Molnar <mingo@elte.hu> 1230932496 +0100
committer Ingo Molnar <mingo@elte.hu> 1230932496 +0100

Merge branch 'linus' into x86/cleanups

Conflicts:
	arch/x86/kernel/reboot.c