]> 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, 21 Sep 2011 03:27:22 +0000 (13:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:27:22 +0000 (13:27 +1000)
commita2b3a872986fb96e21e80f7649d998f2c430efc5
treea2097b45ce4439c0ce228ec29b3973563bc0b6af
parent9845749b2ab41a049b9a6cc3560822f9b27b9a6f
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