]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 04:43:52 +0000 (15:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 04:43:52 +0000 (15:43 +1100)
commitf556133c5da810fc83848bb4f942ea1c7080a3c1
tree20285620ddd4a79631fca8bfb31f5ca02321ce05
parent26a99a0c5c5debb425dc0266339943c99164cdfd
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