Skip to content

Commit

Permalink
Merge branch 'x86/paravirt' into x86/cleanups
Browse files Browse the repository at this point in the history 
Reason: The setup cleanups conflict with the paravirt cleanups. Avoid
a rather large merge conflict

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Aug 27, 2009
2 parents 10f02d1 + ac5672f commit 6effcd9
Show file tree
Hide file tree
Showing 2 changed files with 721 additions and 710 deletions.
Loading

0 comments on commit 6effcd9

Please sign in to comment.