]> 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, 5 Sep 2011 05:36:40 +0000 (15:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:36:40 +0000 (15:36 +1000)
commit016c3fdab7138b6d0286b0e7ccb46777abe78280
tree4b288e70a620a46c3e8b7cee759d0a7d7439e34e
parent22a819900e9c787030d41c5a7f4b06a6d76396e1
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