Merge branch 'x86/paravirt' into x86/cleanups
authorThomas Gleixner <tglx@linutronix.de>
Thu, 27 Aug 2009 14:42:07 +0000 (16:42 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 27 Aug 2009 14:42:32 +0000 (16:42 +0200)
Reason: The setup cleanups conflict with the paravirt cleanups. Avoid
a rather large merge conflict

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

Trivial merge