]> 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>
Fri, 12 Aug 2011 03:01:45 +0000 (13:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Aug 2011 03:01:45 +0000 (13:01 +1000)
commit667320abda501013b45dd31748d61d2ce3b24d83
treeee4c9e366f3c25e87ec8033c4f6c991f94a80f3e
parent3317a084fef55eaf8c7187fd92771009c48ef7ca
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