]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 07:21:06 +0000 (18:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 07:21:06 +0000 (18:21 +1100)
commitc4430cbf3e80b80a459a79828be5f6178254824e
treea9a19168c0289ce972b5998b0bceae0a602106ca
parent69220aea4e99ffd0015c736392db34528d72b5c9
parentd797b195cd9094b2e4f398b21fd4ffdc5be62285
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