tree a54b0ff24dd4b09fe8b3bff62b7c5ce82e197387
parent ff55df53dfdd338906c8ba9d1f4a759b86b869d5
parent ac5672f82c39ff2f8dce81bf3e68b1dfc41f366f
author Ingo Molnar <mingo@elte.hu> 1251800010 +0200
committer Ingo Molnar <mingo@elte.hu> 1251800010 +0200

Merge branch 'x86/paravirt' into x86/cpu

Conflicts:
	arch/x86/include/asm/paravirt.h

Manual merge:
	arch/x86/include/asm/paravirt_types.h

Merge reason: x86/paravirt conflicts non-trivially with x86/cpu,
              resolve it.

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