]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'i7300_edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 02:47:46 +0000 (12:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 02:47:46 +0000 (12:47 +1000)
commit5dcdac2985dae1586bb3353cf3b272730240c8e8
treeead7c4f021cd16a9fe4980e61c49b2da61f5edd1
parente54c659e703891f8b60eae587d4068008dd9af91
parentc74040a22704c873388906bc4f26c8e435f4ffbe
Merge remote-tracking branch 'i7300_edac/linux_next'

Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/cpu/mcheck/mce.c
include/linux/edac.h