]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Oct 2011 03:46:53 +0000 (14:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Oct 2011 03:46:53 +0000 (14:46 +1100)
commit30a53c2a72d1431d93b9ad8ee41cb2ba1a85b7a8
treeb78833954b4538d743c8a5da54c42456fb14d10d
parent0b072aea6934e6cc3c06e80534004c4768714d28
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