]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 03:41:03 +0000 (13:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 03:41:03 +0000 (13:41 +1000)
commita5d391afe2db0694d84661762bcfd491f380f0fb
tree0d98a7f4ddcc9ad3a70920f6c7b4bf9909270754
parent5d05e0568da765e11287de3c2282ba9ac200011d
parentbe773bb7e3dc78ce73f5d51889c3cc4380d11e09
Merge remote-tracking branch 'edac/linux_next'

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