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)
commit6effcd92454ca5d7021b74f89fcac75209e146f9
tree6a3ebef5074ca4721f8f36fe85b9287a16ba2a01
parent10f02d1168585edf66229bb2ec90a42f32667a78
parentac5672f82c39ff2f8dce81bf3e68b1dfc41f366f
Merge branch 'x86/paravirt' into x86/cleanups

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

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