Skip to content

Commit

Permalink
Merge branch 'x86/defconfig' into x86/mce2
Browse files Browse the repository at this point in the history 
Conflicts (resolved):
	arch/x86/configs/x86_64_defconfig

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information
H. Peter Anvin committed Feb 25, 2009
2 parents be71b85 + 15d4fcd commit 2aaa822
Show file tree
Hide file tree
Showing 2 changed files with 665 additions and 172 deletions.
Loading

0 comments on commit 2aaa822

Please sign in to comment.