]> 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>
Wed, 31 Aug 2011 03:08:31 +0000 (13:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 03:08:31 +0000 (13:08 +1000)
commitac3cbc811f2d92dc496d9da1d58ff60598278d7d
tree328b927d5220aff95f4077fce2e831fe85cef924
parente1cbdf3de51b57158619c3fb272df48b44732f01
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