tree 45c4575110c61ca181196c038e1579f0f4fb0174
parent 34646bca474142e1424e5f6c4a33cb2ba0930ea1
parent 5b664cb235e97afbf34db9c4d77f08ebd725335e
author Ingo Molnar <mingo@elte.hu> 1216381287 +0200
committer Ingo Molnar <mingo@elte.hu> 1216381287 +0200

Merge branch 'linus' into x86/paravirt-spinlocks

Conflicts:

	arch/x86/kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>