]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'x86/defconfig' into x86/mce2
authorH. Peter Anvin <hpa@zytor.com>
Tue, 24 Feb 2009 23:59:14 +0000 (15:59 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 25 Feb 2009 00:01:17 +0000 (16:01 -0800)
commit2aaa822984b97efd894d10d1e1382206ef0291a7
tree1065b2363853588b2f826117634caf5a8e044e23
parentbe71b8553d0522aba535a815baaebb1f0bb9a9ec
parent15d4fcd615989ed83fe848e6a3c7e9f0361cf0d0
Merge branch 'x86/defconfig' into x86/mce2

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

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