Merge branch 'x86/defconfig' into x86/mce2

Browse source

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

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

...

This commit is contained in:

H. Peter Anvin 2009-02-24 15:59:14 -08:00

parent be71b8553d 15d4fcd615

commit 2aaa822984

2 changed files with 665 additions and 172 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

417

arch/x86/configs/i386_defconfig

View file

420

arch/x86/configs/x86_64_defconfig

View file