]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'i7300_edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Aug 2011 03:38:21 +0000 (13:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Aug 2011 03:38:21 +0000 (13:38 +1000)
commitd947090142afc58d22806042d22a68543bc6d41b
tree0feb93c206d5848487e284a2bd0f21ca500c6a0d
parent1c16b4d17f60539e86e9389a521bea6460c496b5
parentc74040a22704c873388906bc4f26c8e435f4ffbe
Merge remote-tracking branch 'i7300_edac/linux_next'

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