]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'i7300_edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 06:56:24 +0000 (16:56 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 06:56:24 +0000 (16:56 +1000)
commita054fe64e1a70ed47b4e3dfda32e49640eba8c81
treed43b96e21b0befe289d2d9f7547826295dfbfd5d
parent2730137bfa67993421e183e05a6955e849d4772e
parentc74040a22704c873388906bc4f26c8e435f4ffbe
Merge remote-tracking branch 'i7300_edac/linux_next'

Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/cpu/mcheck/mce.c
include/linux/edac.h