]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 03:37:59 +0000 (14:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 03:37:59 +0000 (14:37 +1100)
commit7f50ca5ce31b32a65a187076d82d7357bbc359aa
tree7ea938c416045091eef718f4be5ae1141b1f5d6f
parent282c1f996fc99048ad9c180f4791516c65c34e57
parenta87fd9098b45c4b489fe278149adc668f25d4033
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