]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'edac-amd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Oct 2012 01:04:41 +0000 (12:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Oct 2012 01:04:41 +0000 (12:04 +1100)
1  2 
drivers/edac/edac_mc.c
include/linux/edac.h

Simple merge
Simple merge