]> 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, 12 Sep 2011 04:16:16 +0000 (14:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 04:16:16 +0000 (14:16 +1000)
commit2620b70cc470d30b05b540185a198015592f69a3
treeadb1b11e76980b7fc1b1db7fed1660037b0b3d2b
parent96d1d63de4ad4045f3871e578a3ed8fb72b794a7
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