]> 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>
Fri, 19 Aug 2011 01:49:55 +0000 (11:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 01:49:55 +0000 (11:49 +1000)
commit07885bff12416eaf14e32771e9e8f5ea8bbd03bd
treef82202918197c84044464b818f6011aa1145b92a
parentd1167a24504e53013d5b131a4d8560cc0cdae68f
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