]> 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, 10 Aug 2011 01:10:35 +0000 (11:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 01:10:35 +0000 (11:10 +1000)
commitf94249d0c7d3458d9ebb31784afbf02ff11d4cec
tree4106ff8d0d813286f040efe2175102241f484344
parentb810d65242afaed84a781ee3d00b686367eb7327
parentb1f7b41537cd4aa7727c8e88666879a9b9ecdeff
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