]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 05:46:48 +0000 (15:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 05:46:48 +0000 (15:46 +1000)
commitd2c83f23814b07e424064e0a03c45916b75241ef
tree55053654a617ffb15915ce0cadf33c533e6dc26f
parent69d7c1c529564bfd9201450cbd294781b93ab18c
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