]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'edac-for-3.15' into for-next
authorBorislav Petkov <bp@suse.de>
Thu, 27 Feb 2014 17:15:29 +0000 (18:15 +0100)
committerBorislav Petkov <bp@suse.de>
Thu, 27 Feb 2014 17:15:29 +0000 (18:15 +0100)
1  2 
arch/x86/kernel/amd_nb.c
drivers/edac/i7core_edac.c

Simple merge
Simple merge