]> 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>
Tue, 23 Aug 2011 04:06:50 +0000 (14:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 04:06:50 +0000 (14:06 +1000)
commitba07686e42e97d49a5a9cc8d8ba3eb148ef09bc0
tree418f10c2a2e4a1359fd7eaa77fda4aee1d1344aa
parent4c45be009d602fdceb90f75ae5ae549dcb23ee81
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