]> 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, 27 Sep 2011 04:38:03 +0000 (14:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 04:38:03 +0000 (14:38 +1000)
commitc9a9dc067c50ce4f3780c39049117952c44942b0
tree331e39a24ef2e8157a8d360492538d3cb44937e0
parented5b8908fa0174a56cb7e428fe785ef81f0e7338
parentbe773bb7e3dc78ce73f5d51889c3cc4380d11e09
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