Merge branch 'x86/paravirt' into x86/cleanups

Browse source

Reason: The setup cleanups conflict with the paravirt cleanups. Avoid
a rather large merge conflict

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

...

This commit is contained in:

Thomas Gleixner 2009-08-27 16:42:07 +02:00

parent 10f02d1168 ac5672f82c

commit 6effcd9245

2 changed files with 721 additions and 710 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

711

arch/x86/include/asm/paravirt.h

View file

720

arch/x86/include/asm/paravirt_types.h

View file