]> 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>
Fri, 9 Sep 2011 04:48:27 +0000 (14:48 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 04:48:27 +0000 (14:48 +1000)
commit0ef20cc7a9c5620d53c2890d7ecfda9870828f1d
treef2d4693ff003a8fbbc00c1c30bb00ea41a6c4430
parent570f2ff1c0f3ed3f0f8f6973c061aa9c49baacbb
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