]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'edac-amd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 01:42:05 +0000 (12:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 01:42:05 +0000 (12:42 +1100)
1  2 
arch/arm64/boot/dts/apm/apm-storm.dtsi
drivers/edac/amd64_edac.c

Simple merge