]> 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, 30 Sep 2011 02:49:40 +0000 (12:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 02:49:40 +0000 (12:49 +1000)
commit8505d7d92323946544dc4335824952b0abd004c7
treef937b7518fa45104975d19380239e25142d52235
parent9ddc80efa67e583505e9fe03475b4a21ce7b81d1
parentbf77ec6a6e1b1b030424a3efe4bf94dbf8f07f2e
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