]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 05:13:34 +0000 (16:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 05:13:34 +0000 (16:13 +1100)
commite5da342b72d5635b16fa77842494b5193fcfe65a
tree67b10bae278e9b4ef0c13606e371d9e1e1672464
parent6ca05edd26523e2c0a6215c1e2b67fd078170994
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