Skip to content

Commit

Permalink
Merge branch 'x86/headers' into x86/core
Browse files Browse the repository at this point in the history
  • Loading branch information
Ingo Molnar committed Feb 17, 2009
2 parents 494df59 + ee8b53c commit 9f361c2
Showing 1 changed file with 0 additions and 114 deletions.
114 changes: 0 additions & 114 deletions arch/x86/include/asm/page_64.h.rej

This file was deleted.

0 comments on commit 9f361c2

Please sign in to comment.