]> 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, 29 Sep 2011 04:19:23 +0000 (14:19 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 04:19:23 +0000 (14:19 +1000)
commit5416b394aaa1d1e95a7befdf7ca686bd607fbf1c
tree4d7d4bd79727853399f1d036db007ba643f0bcc9
parent6f6e13b0600d3798eb94968e85c45a6a7a1daf34
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