]> 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>
Thu, 22 Sep 2011 07:01:06 +0000 (17:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 07:01:06 +0000 (17:01 +1000)
commit4f27a824536fa08da87034f55039d2a13428868d
tree3203653ed8e535cd27713738219fce82d5cd19ad
parent9f688f530ef60fb15818626192bbb63f5bb6cf1f
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