]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'i7300_edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 04:41:43 +0000 (14:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 04:41:43 +0000 (14:41 +1000)
commit5b0e08f1c0c6db1c0ec5bf6eaa1b4f2681ad0c72
tree7ed285582cee9bbb93fa3d7d8c5b37ce171ce5ba
parent9b93421717141f8833827d00ea98d8acdba74b98
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