Merge branch 'x86/defconfig' into x86/mce2 · 2aaa822984 - Gogs

Merge branch 'x86/defconfig' into x86/mce2

Conflicts (resolved):
	arch/x86/configs/x86_64_defconfig

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

H. Peter Anvin 16 years ago

parent

be71b8553d 15d4fcd615

commit

2aaa822984

2 changed files with 518 additions and 149 deletions

Split View Show Diff Stats

				
					File diff suppressed because it is too large
					
						+ 260
						
						- 76
					
arch/x86/configs/i386_defconfig

				
					File diff suppressed because it is too large
					
						+ 258
						
						- 73
					
arch/x86/configs/x86_64_defconfig