Merge branch 'x86/paravirt' into x86/cpu

Browse source

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>

...

This commit is contained in:

Ingo Molnar 2009-09-01 12:13:30 +02:00

parent ff55df53df ac5672f82c

commit c931aaf0e1

2 changed files with 722 additions and 711 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

712

arch/x86/include/asm/paravirt.h

View file

721

arch/x86/include/asm/paravirt_types.h

View file