Skip to content

Commit

Permalink
Merge branch 'x86/paravirt' into x86/cpu
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Ingo Molnar committed Sep 1, 2009
2 parents ff55df5 + ac5672f commit c931aaf
Show file tree
Hide file tree
Showing 2 changed files with 722 additions and 711 deletions.
Loading

0 comments on commit c931aaf

Please sign in to comment.